snxxz_scripts.git

parent: de586e58 | 补丁 | 提交 | ignore whitespace

client_linchunjie

2019-03-29 811e1d052b067faab41fbd6718c391adc8ac9e0c

3335 修复拍卖行bug

5个文件已修改

	System/Auction/AuctionInquiryModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FamilyAuctioncell.cs	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FullServiceAuctioncell.cs	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyAuctionCell.cs	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyFocusCell.cs	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Auction/AuctionInquiryModel.cs

@@ -468,6 +468,10 @@
                {

                    PlayerAuctionItemInfoDic.Remove(guid);

                }

                if (AttentionAuctionItemDic.ContainsKey(guid))

                {

                    AttentionAuctionItemDic.Remove(guid);

                }

            }

            if (ClearAuctionUpdate != null)

            {


 System/Auction/FamilyAuctioncell.cs

@@ -37,7 +37,10 @@
        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

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

        private AuctionItemConfig AuctionItem;

        private AuctionItem FamilyAuctionItem;
        private AuctionItem FamilyAuctionItem;



        bool cacheIsWarmUp = false;


        public void GetFamilyAuctionGUID(string GUIID)

        {

            m_NeedImage.SetActive(false);

@@ -81,18 +84,8 @@
                }

            }



            if (auctionHelpModel.IsItemWarmUp(familyAuctionItem))

            {

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

            }

            else if (familyAuctionItem.biddingPrice != 0)

            {

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

            }

            else

            {

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

            }

            DisplayState();



            ItemCellModel cellModel = new ItemCellModel(familyAuctionItem.itemId, true, (ulong)familyAuctionItem.itemCount);

            m_ItemCell.Init(cellModel);

            m_ItemCell.button.SetListener(() =>

@@ -213,12 +206,42 @@
                {

                    SetButtonStatus();



                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;

                    var realOverTime = overTime.AddTicks(totalTick);

                    if (FamilyAuctionItem.latestBiddingTime >= overTime)

                    {

                        realOverTime = FamilyAuctionItem.latestBiddingTime.AddTicks(totalTick);

                    }

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }



                if (auctionHelpModel.IsItemWarmUp(FamilyAuctionItem) != cacheIsWarmUp)

                {

                    DisplayState();

                }

            }

        }

        void DisplayState()

        {

            if (FamilyAuctionItem != null)

            {

                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(FamilyAuctionItem);

                if (cacheIsWarmUp)

                {

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

                }

                else if (FamilyAuctionItem.biddingPrice != 0)

                {

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

                }

                else

                {

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

                }

            }

        }


 System/Auction/FullServiceAuctioncell.cs

@@ -40,6 +40,8 @@
        private AuctionItemConfig AuctionItem;

        private AuctionItem FullServiceAuction;



        bool cacheIsWarmUp = false;



        public void GetFullServiceAuctionGUID(string GUID, int index)

        {

            m_NeedImage.SetActive(false);

@@ -111,18 +113,7 @@


            }



            if (auctionHelpModel.IsItemWarmUp(fullServiceAuction))

            {

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

            }

            else if (fullServiceAuction.biddingPrice != 0)

            {

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

            }

            else

            {

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

            }

            DisplayState();



            ItemCellModel cellModel = new ItemCellModel(fullServiceAuction.itemId, true, (ulong)fullServiceAuction.itemCount);

            m_ItemCell.Init(cellModel);

@@ -210,6 +201,26 @@
            });

        }



        void DisplayState()

        {

            if (FullServiceAuction != null)

            {

                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(FullServiceAuction);

                if (cacheIsWarmUp)

                {

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

                }

                else if (FullServiceAuction.biddingPrice != 0)

                {

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

                }

                else

                {

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

                }

            }

        }



        private void LateUpdate()

        {

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

@@ -246,15 +257,25 @@
                {

                    SetButtonStatus();



                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;

                    var realOverTime = overTime.AddTicks(totalTick);

                    if (FullServiceAuction.latestBiddingTime >= overTime)

                    {

                        realOverTime = FullServiceAuction.latestBiddingTime.AddTicks(totalTick);

                    }



                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }



                if (auctionHelpModel.IsItemWarmUp(FullServiceAuction) != cacheIsWarmUp)

                {

                    DisplayState();

                }

            }

        }





        private void SetButtonStatus()

        {


 System/Auction/MyAuctionCell.cs

@@ -31,6 +31,9 @@
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        private AuctionItemConfig AuctionItem;

        private AuctionItem MyAuction;



        bool cacheIsWarmUp = false;



        public void GetMyAuctionGUID(string GUIID)

        {

            if (!model.PlayerAuctionItemInfoDic.ContainsKey(GUIID) && !model.FamilyAuctionItemDic.ContainsKey(GUIID))

@@ -71,20 +74,7 @@
            AuctionItem = auctionItem;

            m_Income.text = 0.ToString();



            bool isWarmUp = auctionHelpModel.IsItemWarmUp(myAuction);



            if (isWarmUp)

            {

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

            }

            else if (myAuction.biddingPrice == 0)

            {

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

            }

            else

            {

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

            }

            DisplayState();



            if (myAuction.biddingPrice != 0)

            {

@@ -167,19 +157,43 @@
                }

                if (overTime < extensionTime)//加时中

                {

                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;

                    var realOverTime = overTime.AddTicks(totalTick);

                    if (MyAuction.latestBiddingTime >= overTime)

                    {

                        realOverTime = MyAuction.latestBiddingTime.AddTicks(totalTick);

                    }

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }



                if (auctionHelpModel.IsItemWarmUp(MyAuction) != cacheIsWarmUp)

                {

                    DisplayState();

                }

            }

        }

        private void SetButtonStatus()

        void DisplayState()

        {





            if (MyAuction != null)

            {

                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(MyAuction);

                if (cacheIsWarmUp)

                {

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

                }

                else if (MyAuction.biddingPrice != 0)

                {

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

                }

                else

                {

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

                }

            }

        }
    }


 System/Auction/MyFocusCell.cs

@@ -37,6 +37,9 @@
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        private AuctionItemConfig AuctionItem;

        private AuctionItem MyFocusItem;



        bool cacheIsWarmUp = false;



        public void GetMyFocusGUID(string GUIID)

        {

            if (!model.AttentionAuctionItemDic.ContainsKey(GUIID) && !model.FamilyAuctionItemDic.ContainsKey(GUIID))

@@ -95,18 +98,9 @@


                }

            }

            if (auctionHelpModel.IsItemWarmUp(myAuction))

            {

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

            }

            else if (myAuction.biddingPrice != 0)

            {

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

            }

            else

            {

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

            }



            DisplayState();



            ItemCellModel cellModel = new ItemCellModel(myAuction.itemId, true, (ulong)myAuction.itemCount);

            m_ItemCell.Init(cellModel);

            m_ItemCell.button.SetListener(() =>

@@ -231,12 +225,42 @@
                {

                    SetButtonStatus();



                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;

                    var realOverTime = overTime.AddTicks(totalTick);

                    if (MyFocusItem.latestBiddingTime >= overTime)

                    {

                        realOverTime = MyFocusItem.latestBiddingTime.AddTicks(totalTick);

                    }

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }



                if (auctionHelpModel.IsItemWarmUp(MyFocusItem) != cacheIsWarmUp)

                {

                    DisplayState();

                }

            }

        }

        void DisplayState()

        {

            if (MyFocusItem != null)

            {

                cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(MyFocusItem);

                if (cacheIsWarmUp)

                {

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

                }

                else if (MyFocusItem.biddingPrice != 0)

                {

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

                }

                else

                {

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

                }

            }

        }

			@@ -468,6 +468,10 @@
			{
			PlayerAuctionItemInfoDic.Remove(guid);
			}
			if (AttentionAuctionItemDic.ContainsKey(guid))
			{
			AttentionAuctionItemDic.Remove(guid);
			}
			}
			if (ClearAuctionUpdate != null)
			{

			@@ -37,7 +37,10 @@
			AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
			ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
			private AuctionItemConfig AuctionItem;
			private AuctionItem FamilyAuctionItem;
			private AuctionItem FamilyAuctionItem;

			bool cacheIsWarmUp = false;

			public void GetFamilyAuctionGUID(string GUIID)
			{
			m_NeedImage.SetActive(false);
			@@ -81,18 +84,8 @@
			}
			}

			if (auctionHelpModel.IsItemWarmUp(familyAuctionItem))
			{
			m_BiddingText.text = Language.Get("PMH_17");
			}
			else if (familyAuctionItem.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			DisplayState();

			ItemCellModel cellModel = new ItemCellModel(familyAuctionItem.itemId, true, (ulong)familyAuctionItem.itemCount);
			m_ItemCell.Init(cellModel);
			m_ItemCell.button.SetListener(() =>
			@@ -213,12 +206,42 @@
			{
			SetButtonStatus();

			var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);
			var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;
			var realOverTime = overTime.AddTicks(totalTick);
			if (FamilyAuctionItem.latestBiddingTime >= overTime)
			{
			realOverTime = FamilyAuctionItem.latestBiddingTime.AddTicks(totalTick);
			}
			TimeSpan timeSpan2 = realOverTime - timeNow;
			int timeSeconds = (int)timeSpan2.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));
			m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);
			}

			if (auctionHelpModel.IsItemWarmUp(FamilyAuctionItem) != cacheIsWarmUp)
			{
			DisplayState();
			}
			}
			}

			void DisplayState()
			{
			if (FamilyAuctionItem != null)
			{
			cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(FamilyAuctionItem);
			if (cacheIsWarmUp)
			{
			m_BiddingText.text = Language.Get("PMH_07");
			}
			else if (FamilyAuctionItem.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			}
			}

			@@ -40,6 +40,8 @@
			private AuctionItemConfig AuctionItem;
			private AuctionItem FullServiceAuction;

			bool cacheIsWarmUp = false;

			public void GetFullServiceAuctionGUID(string GUID, int index)
			{
			m_NeedImage.SetActive(false);
			@@ -111,18 +113,7 @@

			}

			if (auctionHelpModel.IsItemWarmUp(fullServiceAuction))
			{
			m_BiddingText.text = Language.Get("PMH_07");
			}
			else if (fullServiceAuction.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			DisplayState();

			ItemCellModel cellModel = new ItemCellModel(fullServiceAuction.itemId, true, (ulong)fullServiceAuction.itemCount);
			m_ItemCell.Init(cellModel);
			@@ -210,6 +201,26 @@
			});
			}

			void DisplayState()
			{
			if (FullServiceAuction != null)
			{
			cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(FullServiceAuction);
			if (cacheIsWarmUp)
			{
			m_BiddingText.text = Language.Get("PMH_07");
			}
			else if (FullServiceAuction.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			}
			}

			private void LateUpdate()
			{
			if (AuctionItem != null && FullServiceAuction != null)
			@@ -246,15 +257,25 @@
			{
			SetButtonStatus();

			var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);
			var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;
			var realOverTime = overTime.AddTicks(totalTick);
			if (FullServiceAuction.latestBiddingTime >= overTime)
			{
			realOverTime = FullServiceAuction.latestBiddingTime.AddTicks(totalTick);
			}

			TimeSpan timeSpan2 = realOverTime - timeNow;
			int timeSeconds = (int)timeSpan2.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));
			m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);
			}

			if (auctionHelpModel.IsItemWarmUp(FullServiceAuction) != cacheIsWarmUp)
			{
			DisplayState();
			}
			}
			}


			private void SetButtonStatus()
			{

			@@ -31,6 +31,9 @@
			ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
			private AuctionItemConfig AuctionItem;
			private AuctionItem MyAuction;

			bool cacheIsWarmUp = false;

			public void GetMyAuctionGUID(string GUIID)
			{
			if (!model.PlayerAuctionItemInfoDic.ContainsKey(GUIID) && !model.FamilyAuctionItemDic.ContainsKey(GUIID))
			@@ -71,20 +74,7 @@
			AuctionItem = auctionItem;
			m_Income.text = 0.ToString();

			bool isWarmUp = auctionHelpModel.IsItemWarmUp(myAuction);

			if (isWarmUp)
			{
			m_BiddingText.text = Language.Get(myAuction.auctionType == 0 ? "PMH_07" : "PMH_17");
			}
			else if (myAuction.biddingPrice == 0)
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			DisplayState();

			if (myAuction.biddingPrice != 0)
			{
			@@ -167,19 +157,43 @@
			}
			if (overTime < extensionTime)//加时中
			{
			var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);
			var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;
			var realOverTime = overTime.AddTicks(totalTick);
			if (MyAuction.latestBiddingTime >= overTime)
			{
			realOverTime = MyAuction.latestBiddingTime.AddTicks(totalTick);
			}
			TimeSpan timeSpan2 = realOverTime - timeNow;
			int timeSeconds = (int)timeSpan2.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));
			m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);
			}

			if (auctionHelpModel.IsItemWarmUp(MyAuction) != cacheIsWarmUp)
			{
			DisplayState();
			}
			}
			}

			private void SetButtonStatus()
			void DisplayState()
			{


			if (MyAuction != null)
			{
			cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(MyAuction);
			if (cacheIsWarmUp)
			{
			m_BiddingText.text = Language.Get("PMH_07");
			}
			else if (MyAuction.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			}
			}
			}

			@@ -37,6 +37,9 @@
			ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
			private AuctionItemConfig AuctionItem;
			private AuctionItem MyFocusItem;

			bool cacheIsWarmUp = false;

			public void GetMyFocusGUID(string GUIID)
			{
			if (!model.AttentionAuctionItemDic.ContainsKey(GUIID) && !model.FamilyAuctionItemDic.ContainsKey(GUIID))
			@@ -95,18 +98,9 @@

			}
			}
			if (auctionHelpModel.IsItemWarmUp(myAuction))
			{
			m_BiddingText.text = Language.Get(myAuction.auctionType == 0 ? "PMH_07" : "PMH_17");
			}
			else if (myAuction.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}

			DisplayState();

			ItemCellModel cellModel = new ItemCellModel(myAuction.itemId, true, (ulong)myAuction.itemCount);
			m_ItemCell.Init(cellModel);
			m_ItemCell.button.SetListener(() =>
			@@ -231,12 +225,42 @@
			{
			SetButtonStatus();

			var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);
			var totalTick = auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond;
			var realOverTime = overTime.AddTicks(totalTick);
			if (MyFocusItem.latestBiddingTime >= overTime)
			{
			realOverTime = MyFocusItem.latestBiddingTime.AddTicks(totalTick);
			}
			TimeSpan timeSpan2 = realOverTime - timeNow;
			int timeSeconds = (int)timeSpan2.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));
			m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);
			}

			if (auctionHelpModel.IsItemWarmUp(MyFocusItem) != cacheIsWarmUp)
			{
			DisplayState();
			}
			}
			}

			void DisplayState()
			{
			if (MyFocusItem != null)
			{
			cacheIsWarmUp = auctionHelpModel.IsItemWarmUp(MyFocusItem);
			if (cacheIsWarmUp)
			{
			m_BiddingText.text = Language.Get("PMH_07");
			}
			else if (MyFocusItem.biddingPrice != 0)
			{
			m_BiddingText.text = Language.Get("PMH_06");
			}
			else
			{
			m_BiddingText.text = Language.Get("PMH_05");
			}
			}
			}