snxxz_scripts.git

parent: 27621f1f | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2019-03-28 7a9e90faa024880d6e95b3ef11adcd71ed661231

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

7个文件已修改

	System/Auction/FamilyAuctionWin.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FamilyAuctioncell.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FullServiceAuctioncell.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyAuctionCell.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyAuctionWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyFocusCell.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyFocusWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Auction/FamilyAuctionWin.cs

@@ -130,6 +130,12 @@
            {

                return -havex3.CompareTo(havey3);

            }

            var auctionConfigX = AuctionItemConfig.Get(x.ItemID);

            var auctionConfigY = AuctionItemConfig.Get(y.ItemID);

            if (auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority) != 0)//按照拍卖物品表排序

            {

                return auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority);

            }

            return 1;

        }

@@ -181,6 +187,7 @@
            scends = (int)timeSpan.TotalSeconds;

            return scends;

        }

    }

}

 System/Auction/FamilyAuctioncell.cs

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

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

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

            {

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

@@ -185,7 +186,6 @@
                DateTime extensionTime = FamilyAuctionItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    if (m_PriceButton.interactable)

                    {

                        m_PriceButton.interactable = false;

@@ -199,9 +199,8 @@
                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

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

                }

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

                else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * FamilyAuctionItem.ItemCount;

                    var needMoney = 0;

                    if (FamilyAuctionItem.BidderPrice == 0)


 System/Auction/FullServiceAuctioncell.cs

@@ -47,6 +47,7 @@
            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))

            {

@@ -109,7 +110,7 @@
                {

                    m_HighestPriceImage.SetActive(true);

                }

               


            }

            if (fullServiceAuction.BidderPrice != 0)

            {

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

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    if (m_PriceButton.interactable)

                    {

                        m_PriceButton.interactable = false;

@@ -231,9 +231,8 @@
                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

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

                }

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

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;

                    var needMoney = 0;

                    if (FullServiceAuction.BidderPrice == 0)


 System/Auction/MyAuctionCell.cs

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

            m_MyAuction.SetActive(false);

            m_FamilyImage.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            AuctionItemClass myAuction = new AuctionItemClass();

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

            if (model.PlayerAuctionItemInfoDic.ContainsKey(GUIID))

@@ -96,8 +97,8 @@
                if (type == 0)

                {

                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

                        AuctionTaxrate1 * myAuction.BidderPrice * myAuction.ItemCount) / 100);//个人税收

                    int incomeNumber = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate;

                        AuctionTaxrate1 * myAuction.BidderPrice) / 100);//个人税收

                    int incomeNumber = myAuction.BidderPrice - auctionTaxrate;

                    m_Income.text = incomeNumber.ToString();

                }

                else if (type == 1)

@@ -105,7 +106,7 @@
                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

                       AuctionTaxrate2 * myAuction.BidderPrice) / 100);//仙盟税收

                    int number = myAuction.BidderPrice - auctionTaxrate;

                    int incomeMax =Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);

                    int incomeMax = Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);

                    int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count);

                    if (incomeMax >= incomeNumber)

                    {

@@ -160,13 +161,11 @@
                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.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes)//拍卖中

                else if (minute < (AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes))//拍卖中

                {

                    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));

                }


 System/Auction/MyAuctionWin.cs

@@ -139,6 +139,12 @@
            {

                return -havex3.CompareTo(havey3);

            }

            var auctionConfigX = AuctionItemConfig.Get(x.ItemID);

            var auctionConfigY = AuctionItemConfig.Get(y.ItemID);

            if (auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority) != 0)//按照拍卖物品表排序

            {

                return auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority);

            }

            return 1;

        }
    }

 System/Auction/MyFocusCell.cs

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

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            AuctionItemClass myAuction = new AuctionItemClass();

            int type = 0;

            if (model.AttentionAuctionItemDic.ContainsKey(GUIID))

@@ -204,7 +205,6 @@
                DateTime extensionTime = MyFocusItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    if (m_PriceButton.interactable)

                    {

                        m_PriceButton.interactable = false;

@@ -218,9 +218,8 @@
                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

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

                }

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

                else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * MyFocusItem.ItemCount;

                    var needMoney = 0;

                    if (MyFocusItem.BidderPrice == 0)


 System/Auction/MyFocusWin.cs

@@ -147,6 +147,12 @@
            {

                return -havex3.CompareTo(havey3);

            }

            var auctionConfigX = AuctionItemConfig.Get(x.ItemID);

            var auctionConfigY = AuctionItemConfig.Get(y.ItemID);

            if (auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority) != 0)//按照拍卖物品表排序

            {

                return auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority);

            }

            return 1;

        }

			@@ -130,6 +130,12 @@
			{
			return -havex3.CompareTo(havey3);
			}
			var auctionConfigX = AuctionItemConfig.Get(x.ItemID);
			var auctionConfigY = AuctionItemConfig.Get(y.ItemID);
			if (auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority) != 0)//按照拍卖物品表排序
			{
			return auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority);
			}
			return 1;
			}

			@@ -181,6 +187,7 @@
			scends = (int)timeSpan.TotalSeconds;
			return scends;
			}

			}

			}

			@@ -45,6 +45,7 @@
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			if (!model.FamilyAuctionItemDic.ContainsKey(GUIID))
			{
			DebugEx.LogError("未找到相应的仙盟拍品数据");
			@@ -185,7 +186,6 @@
			DateTime extensionTime = FamilyAuctionItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);
			if (minute < AuctionItem.NoticeSaleMinutes)//预热中
			{
			m_OverTime.gameObject.SetActive(false);
			if (m_PriceButton.interactable)
			{
			m_PriceButton.interactable = false;
			@@ -199,9 +199,8 @@
			int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));
			}
			else if (minute <= AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes)//拍卖中
			else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			m_OverTime.gameObject.SetActive(false);
			var maxMoney = AuctionItem.BuyoutPrice * FamilyAuctionItem.ItemCount;
			var needMoney = 0;
			if (FamilyAuctionItem.BidderPrice == 0)

			@@ -47,6 +47,7 @@
			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))
			{
			@@ -109,7 +110,7 @@
			{
			m_HighestPriceImage.SetActive(true);
			}


			}
			if (fullServiceAuction.BidderPrice != 0)
			{
			@@ -217,7 +218,6 @@
			DateTime extensionTime = FullServiceAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);
			if (minute < AuctionItem.NoticeSaleMinutes)//预热中
			{
			m_OverTime.gameObject.SetActive(false);
			if (m_PriceButton.interactable)
			{
			m_PriceButton.interactable = false;
			@@ -231,9 +231,8 @@
			int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));
			}
			else if (minute <= AuctionItem.WorldSaleMinutes+ AuctionItem.NoticeSaleMinutes)//拍卖中
			else if (minute < (AuctionItem.WorldSaleMinutes + AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			m_OverTime.gameObject.SetActive(false);
			var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;
			var needMoney = 0;
			if (FullServiceAuction.BidderPrice == 0)

			@@ -41,6 +41,7 @@
			}
			m_MyAuction.SetActive(false);
			m_FamilyImage.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			AuctionItemClass myAuction = new AuctionItemClass();
			int type = 0;//0自身上架，1仙盟上架
			if (model.PlayerAuctionItemInfoDic.ContainsKey(GUIID))
			@@ -96,8 +97,8 @@
			if (type == 0)
			{
			int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.
			AuctionTaxrate1 * myAuction.BidderPrice * myAuction.ItemCount) / 100);//个人税收
			int incomeNumber = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate;
			AuctionTaxrate1 * myAuction.BidderPrice) / 100);//个人税收
			int incomeNumber = myAuction.BidderPrice - auctionTaxrate;
			m_Income.text = incomeNumber.ToString();
			}
			else if (type == 1)
			@@ -105,7 +106,7 @@
			int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.
			AuctionTaxrate2 * myAuction.BidderPrice) / 100);//仙盟税收
			int number = myAuction.BidderPrice - auctionTaxrate;
			int incomeMax =Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);
			int incomeMax = Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);
			int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count);
			if (incomeMax >= incomeNumber)
			{
			@@ -160,13 +161,11 @@
			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.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes)//拍卖中
			else if (minute < (AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			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));
			}

			@@ -139,6 +139,12 @@
			{
			return -havex3.CompareTo(havey3);
			}
			var auctionConfigX = AuctionItemConfig.Get(x.ItemID);
			var auctionConfigY = AuctionItemConfig.Get(y.ItemID);
			if (auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority) != 0)//按照拍卖物品表排序
			{
			return auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority);
			}
			return 1;
			}
			}

			@@ -49,6 +49,7 @@
			m_ParticipateImage.SetActive(false);
			m_HighestPriceImage.SetActive(false);
			m_EquipmentScoreObj.SetActive(false);
			m_OverTime.gameObject.SetActive(false);
			AuctionItemClass myAuction = new AuctionItemClass();
			int type = 0;
			if (model.AttentionAuctionItemDic.ContainsKey(GUIID))
			@@ -204,7 +205,6 @@
			DateTime extensionTime = MyFocusItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);
			if (minute < AuctionItem.NoticeSaleMinutes)//预热中
			{
			m_OverTime.gameObject.SetActive(false);
			if (m_PriceButton.interactable)
			{
			m_PriceButton.interactable = false;
			@@ -218,9 +218,8 @@
			int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;
			m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));
			}
			else if (minute <= AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes)//拍卖中
			else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			m_OverTime.gameObject.SetActive(false);
			var maxMoney = AuctionItem.BuyoutPrice * MyFocusItem.ItemCount;
			var needMoney = 0;
			if (MyFocusItem.BidderPrice == 0)

			@@ -147,6 +147,12 @@
			{
			return -havex3.CompareTo(havey3);
			}
			var auctionConfigX = AuctionItemConfig.Get(x.ItemID);
			var auctionConfigY = AuctionItemConfig.Get(y.ItemID);
			if (auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority) != 0)//按照拍卖物品表排序
			{
			return auctionConfigX.Sortpriority.CompareTo(auctionConfigY.Sortpriority);
			}
			return 1;
			}