| System/Auction/AuctionHelpModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FamilyAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FullServiceAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyAuctionCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyFocusCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Auction/AuctionHelpModel.cs
@@ -24,7 +24,9 @@ public Dictionary<int, AuctionConfigClass> FullServiceAuctionDic = new Dictionary<int, AuctionConfigClass>();//全服拍卖选择记录 public List<AuctionItemConfig> AuctionItemList = new List<AuctionItemConfig>();//拍卖物品表 AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } } EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } } PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } public int AuctionTaxrate1 = 0;//全服拍品税率 public int AuctionTaxrate2 = 0;//仙盟拍品税率 public int AuctionTaxrate3 = 0;//仙盟拍品个人税率 @@ -163,6 +165,21 @@ } return isBool; } public int GetEquipScore(int equipLevel, int equipPlace)//获取部位的装备评分 { int score = -1; string equipGuid = string.Empty; var equipSet = equipModel.GetEquipSet(equipLevel); equipGuid = equipSet.GetEquip(equipPlace); var equiped = !string.IsNullOrEmpty(equipGuid); if (equiped) { var item = packModel.GetItemByGuid(equipGuid); score = item.equipScore; } return score; } } } System/Auction/FamilyAuctioncell.cs
@@ -86,7 +86,13 @@ if (itemConfig.EquipPlace != 0) { m_EquipmentScoreObj.SetActive(true); // m_Score.text m_Score.text = cellModel.score.ToString(); var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace); m_StateIcon.SetActive(cellModel.score >= equipScore); } else { m_EquipmentScoreObj.SetActive(false); } int needJade = 0; int priceMax = 0; System/Auction/FullServiceAuctioncell.cs
@@ -38,7 +38,7 @@ private AuctionItemConfig AuctionItem; private AuctionItemClass FullServiceAuction; public void GetFullServiceAuctionGUID(string GUID,int index) public void GetFullServiceAuctionGUID(string GUID, int index) { m_NeedImage.SetActive(false); m_ParticipateImage.SetActive(false); @@ -52,7 +52,7 @@ return; } var fullServiceAuction = model.FullServiceAuctionList[indexList]; if (index <5) if (index < 5) { var sendNumber = AuctionInquiry.Instance.GetSendNumber(); if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool) @@ -104,7 +104,13 @@ if (itemConfig.EquipPlace != 0) { m_EquipmentScoreObj.SetActive(true); // m_Score.text m_Score.text = cellModel.score.ToString(); var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace); m_StateIcon.SetActive(cellModel.score >= equipScore); } else { m_EquipmentScoreObj.SetActive(false); } int needJade = 0; int priceMax = 0; @@ -115,7 +121,7 @@ } else { needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd* fullServiceAuction.ItemCount; needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd * fullServiceAuction.ItemCount; } m_JadeNumber.text = fullServiceAuction.BidderPrice.ToString(); m_JadeNumber1.text = priceMax.ToString(); @@ -131,7 +137,8 @@ { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_02", priceMax); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { if (jade >= priceMax) @@ -142,7 +149,7 @@ { WindowCenter.Instance.Open<RechargeTipWin>(); } } } }); }); m_JadeNumber2.text = needJade.ToString(); @@ -150,7 +157,8 @@ { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_01", needJade); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { if (jade >= needJade) @@ -161,7 +169,7 @@ { WindowCenter.Instance.Open<RechargeTipWin>(); } } } }); }); } System/Auction/MyAuctionCell.cs
@@ -72,7 +72,7 @@ } else { if (myAuction.AuctionType == 0)//是否仙盟拍品流拍至全服拍品 { m_BiddingText.text = Language.Get("PMH_07"); @@ -84,7 +84,7 @@ if (type == 0) { int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel. AuctionTaxrate1 * myAuction.BidderPrice* myAuction.ItemCount) / 100);//个人税收 AuctionTaxrate1 * myAuction.BidderPrice * myAuction.ItemCount) / 100);//个人税收 int incomeNumber = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate; m_Income.text = incomeNumber.ToString(); } @@ -94,7 +94,7 @@ AuctionTaxrate2 * myAuction.BidderPrice * myAuction.ItemCount) / 100);//仙盟税收 int number = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate; int incomeMax = number - Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100); int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count); int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count); if (incomeMax >= incomeNumber) { m_Income.text = incomeNumber.ToString(); @@ -106,13 +106,19 @@ } } ItemCellModel cellModel = new ItemCellModel(myAuction.ItemID, true, (ulong)myAuction.ItemCount); ItemCellModel cellModel = new ItemCellModel(myAuction.ItemID, true, (ulong)myAuction.ItemCount); m_ItemCell.Init(cellModel); m_ItemName.text = itemConfig.ItemName; if (itemConfig.EquipPlace != 0) { m_EquipmentScoreObj.SetActive(true); // m_Score.text m_Score.text = cellModel.score.ToString(); var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace); m_StateIcon.SetActive(cellModel.score >= equipScore); } else { m_EquipmentScoreObj.SetActive(false); } if (myAuction.BidderPrice != 0) { @@ -122,7 +128,7 @@ { m_JadeNumber.text = auctionItem.BasePrice.ToString(); } } private void LateUpdate() { @@ -133,7 +139,7 @@ int minute = (int)timeSpan.TotalMinutes; if (minute < AuctionItem.NoticeSaleMinutes)//预热中 { int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds; 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)//拍卖中 System/Auction/MyFocusCell.cs
@@ -7,9 +7,11 @@ using UnityEngine.UI; using System; namespace Snxxz.UI { namespace Snxxz.UI { public class MyFocusCell:MonoBehaviour { public class MyFocusCell : MonoBehaviour { [SerializeField] GameObject m_NeedImage;//需要 [SerializeField] GameObject m_ParticipateImage;//参与竞价 [SerializeField] ItemCell m_ItemCell;//物品 @@ -95,7 +97,13 @@ if (itemConfig.EquipPlace != 0) { m_EquipmentScoreObj.SetActive(true); // m_Score.text m_Score.text = cellModel.score.ToString(); var equipScore = auctionHelpModel.GetEquipScore(itemConfig.LV, itemConfig.EquipPlace); m_StateIcon.SetActive(cellModel.score >= equipScore); } else { m_EquipmentScoreObj.SetActive(false); } int needJade = 0; int priceMax = 0; @@ -120,9 +128,10 @@ m_JadeNumber1.text = priceMax.ToString(); m_PriceButton.SetListener(() => //一口价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_02", priceMax); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { if (jade >= priceMax) @@ -133,15 +142,16 @@ { WindowCenter.Instance.Open<RechargeTipWin>(); } } } }); }); m_JadeNumber2.text = (needJade).ToString(); m_BiddingButton.SetListener(() => //竞价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_01", needJade); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { if (jade >= needJade) @@ -152,7 +162,7 @@ { WindowCenter.Instance.Open<RechargeTipWin>(); } } } }); }); @@ -176,7 +186,7 @@ m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds; 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)//拍卖中
