snxxz_scripts.git

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

client_linchunjie

2019-03-29 eac40c69f90cc0f6f9cc98c08baf38bf054b7f48

3335 修复拍卖行bug

4个文件已修改

	System/Auction/FamilyAuctioncell.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FullServiceAuctioncell.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyAuctionCell.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyFocusCell.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Auction/FamilyAuctioncell.cs

@@ -33,7 +33,6 @@
        [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>(); } }

@@ -45,7 +44,6 @@
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

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

            {

                DebugEx.LogError("未找到相应的仙盟拍品数据");

@@ -214,14 +212,12 @@
                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

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

                    TimeSpan timeSpan2 = extensionTime - timeNow;



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

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

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

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

                }

            }

        }

 System/Auction/FullServiceAuctioncell.cs

@@ -34,7 +34,6 @@
        [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>(); } }

@@ -47,7 +46,6 @@
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == GUID; });

            if (indexList == -1 && !model.BiddingItemInfoDic.ContainsKey(GUID))

            {

@@ -222,6 +220,7 @@


                DateTime overTime = FullServiceAuction.putAwayTime.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);

                DateTime extensionTime = FullServiceAuction.latestBiddingTime.AddSeconds(auctionHelpModel.ExtensionTime);

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

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

                {

                    if (m_PriceButton.interactable)

@@ -246,14 +245,12 @@
                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

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

                    TimeSpan timeSpan2 = extensionTime - timeNow;



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

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

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

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

                }

            }

        }


 System/Auction/MyAuctionCell.cs

@@ -26,7 +26,6 @@
        [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>(); } }

@@ -41,7 +40,6 @@
            }

            m_MyAuction.SetActive(false);

            m_FamilyImage.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            AuctionItem myAuction = new AuctionItem();

            int type = 0;//0自身上架，1仙盟上架

            if (model.PlayerAuctionItemInfoDic.ContainsKey(GUIID))

@@ -169,14 +167,11 @@
                }

                if (overTime < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

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

                    TimeSpan timeSpan2 = extensionTime - timeNow;

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

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

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

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

                }

            }

        }

 System/Auction/MyFocusCell.cs

@@ -32,7 +32,6 @@
        [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>(); } }

@@ -49,7 +48,6 @@
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            AuctionItem myAuction = new AuctionItem();

            int type = 0;

            if (model.AttentionAuctionItemDic.ContainsKey(GUIID))

@@ -232,14 +230,12 @@
                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

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

                    TimeSpan timeSpan2 = extensionTime - timeNow;



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

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

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

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

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

                }

            }

        }

			@@ -33,7 +33,6 @@
			[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>(); } }
			@@ -45,7 +44,6 @@
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			if (!model.FamilyAuctionItemDic.ContainsKey(GUIID))
			{
			DebugEx.LogError("未找到相应的仙盟拍品数据");
			@@ -214,14 +212,12 @@
			if (overTime < extensionTime)//加时中
			{
			SetButtonStatus();
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			}
			m_TimeText.text = Language.Get("PMH_04", 0);
			TimeSpan timeSpan2 = extensionTime - timeNow;

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

			@@ -34,7 +34,6 @@
			[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>(); } }
			@@ -47,7 +46,6 @@
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == GUID; });
			if (indexList == -1 && !model.BiddingItemInfoDic.ContainsKey(GUID))
			{
			@@ -222,6 +220,7 @@

			DateTime overTime = FullServiceAuction.putAwayTime.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);
			DateTime extensionTime = FullServiceAuction.latestBiddingTime.AddSeconds(auctionHelpModel.ExtensionTime);
			m_TimeText.color = UIHelper.GetUIColor(TextColType.Green, true);
			if (minute < AuctionItem.NoticeSaleMinutes)//预热中
			{
			if (m_PriceButton.interactable)
			@@ -246,14 +245,12 @@
			if (overTime < extensionTime)//加时中
			{
			SetButtonStatus();
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			}
			m_TimeText.text = Language.Get("PMH_04", 0);
			TimeSpan timeSpan2 = extensionTime - timeNow;

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

			@@ -26,7 +26,6 @@
			[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>(); } }
			@@ -41,7 +40,6 @@
			}
			m_MyAuction.SetActive(false);
			m_FamilyImage.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			AuctionItem myAuction = new AuctionItem();
			int type = 0;//0自身上架，1仙盟上架
			if (model.PlayerAuctionItemInfoDic.ContainsKey(GUIID))
			@@ -169,14 +167,11 @@
			}
			if (overTime < extensionTime)//加时中
			{
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			}
			m_TimeText.text = Language.Get("PMH_04", 0);
			TimeSpan timeSpan2 = extensionTime - timeNow;
			var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);
			TimeSpan timeSpan2 = realOverTime - timeNow;
			int timeSeconds = (int)timeSpan2.TotalSeconds;
			m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));
			m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));
			m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);
			}
			}
			}

			@@ -32,7 +32,6 @@
			[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>(); } }
			@@ -49,7 +48,6 @@
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			AuctionItem myAuction = new AuctionItem();
			int type = 0;
			if (model.AttentionAuctionItemDic.ContainsKey(GUIID))
			@@ -232,14 +230,12 @@
			if (overTime < extensionTime)//加时中
			{
			SetButtonStatus();
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			}
			m_TimeText.text = Language.Get("PMH_04", 0);
			TimeSpan timeSpan2 = extensionTime - timeNow;

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