System/Auction/AuctionInquiry.cs
@@ -36,7 +36,7 @@ return sendNumber; } var fullServiceAuction = auctionHelpModel.FullServiceAuctionDic[index]; sendNumber += fullServiceAuction.Config.TypeId; if (fullServiceAuction.JobTipBool) { @@ -46,15 +46,15 @@ { sendNumber += fullServiceAuction.Config.ChooseItem2[fullServiceAuction.TypeEntry]; } // DebugEx.Log(sendNumber + "查询类型"); // DebugEx.Log(sendNumber + "查询类型"); return sendNumber; } public void SendQueryAuction(string itemGUID,int indexId,int queryDir, int queryCount=10)//拍卖行查询拍卖中的物品(物品GUID，查询方向，查询个数) public void SendQueryAuction(string itemGUID, int indexId, int queryDir, int queryCount = 10)//拍卖行查询拍卖中的物品(物品GUID，查询方向，查询个数) { var auctionIndex = AuctionIndexConfig.Get(indexId); if (auctionIndex == null) { DebugEx.LogError("拍卖索引表没有查到对应的ID"+ indexId); DebugEx.LogError("拍卖索引表没有查到对应的ID" + indexId); return; } QueryAuctionItem queryAuctionItem = new QueryAuctionItem(); @@ -80,8 +80,21 @@ queryAuctionItem.QueryDir = queryDir; queryAuctionItem.QueryCount = queryCount; SendQueryAuctionItem(queryAuctionItem); } public void SendLocationQuery(string itemGUID)//定位查询 } public void JumpAuctionWin(string itemGUID)//邮件超链接跳转 { if (model.FamilyAuctionItemDic.ContainsKey(itemGUID)) { WindowCenter.Instance.Open<AuctionHouseWin>(true, 1); } else { SendLocationQuery(itemGUID); } } private void SendLocationQuery(string itemGUID)//定位查询 { if (auctionHelpModel.SelectedGenreNow != 0) { @@ -179,7 +192,7 @@ GameNetSystem.Instance.SendInfo(cb514); } public void SendAttentionAuctionItemChange(int itemID,int isAttention)//拍卖行修改关注物品(取消关注发0) public void SendAttentionAuctionItemChange(int itemID, int isAttention)//拍卖行修改关注物品(取消关注发0) { CB518_tagCGAttentionAuctionItemChange cb518 = new CB518_tagCGAttentionAuctionItemChange(); cb518.ItemID = (uint)itemID; System/Auction/AuctionInquiryModel.cs
@@ -394,6 +394,7 @@ { FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime; FamilyAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime); FamilyAuctionItem.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime); var str = UIHelper.ServerStringTrim(RefreshAuctionItem.BiddingTime); if (!str.Equals(string.Empty)) { @@ -425,6 +426,7 @@ var PlayerAuctionItemInfo = PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID]; PlayerAuctionItemInfo.TimeStr = RefreshAuctionItem.AddTime; PlayerAuctionItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime); PlayerAuctionItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime); PlayerAuctionItemInfo.BidderID = (int)RefreshAuctionItem.BidderID; PlayerAuctionItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice; PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID] = PlayerAuctionItemInfo; @@ -434,10 +436,21 @@ var biddingItemInfo = BiddingItemInfoDic[RefreshAuctionItem.ItemGUID]; biddingItemInfo.TimeStr = RefreshAuctionItem.AddTime; biddingItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime); biddingItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime); biddingItemInfo.BidderID = (int)RefreshAuctionItem.BidderID; biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice; BiddingItemInfoDic[RefreshAuctionItem.ItemGUID] = biddingItemInfo; } if (AttentionAuctionItemDic.ContainsKey(RefreshAuctionItem.ItemGUID))//我关注中的拍品 { var attentionAuctionItem = AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID]; attentionAuctionItem.TimeStr = RefreshAuctionItem.AddTime; attentionAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime); attentionAuctionItem.TimeEnd = DateTime.Parse(RefreshAuctionItem.BiddingTime); attentionAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID; attentionAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice; AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID] = attentionAuctionItem; } if (RefreshAuctionItemUpdate != null) { RefreshAuctionItemUpdate(); 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("未找到相应的仙盟拍品数据"); @@ -182,10 +183,10 @@ TimeSpan timeSpan = timeNow - FamilyAuctionItem.Time; int minute = (int)timeSpan.TotalMinutes; DateTime overTime = FamilyAuctionItem.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes); 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,39 +200,15 @@ 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) { needMoney = AuctionItem.BasePrice * FamilyAuctionItem.ItemCount; } else { needMoney = FamilyAuctionItem.BidderPrice + AuctionItem.BiddingAdd * FamilyAuctionItem.ItemCount; } if (!m_PriceButton.interactable || m_PriceImage.gray) { m_PriceButton.interactable = true; m_PriceImage.gray = false; } if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney) { m_BiddingButton.interactable = true; m_BiddingImage.gray = false; } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } SetButtonStatus(); int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } else if (timeNow < extensionTime)//加时中 if (overTime < extensionTime)//加时中 { SetButtonStatus(); if (!m_OverTime.gameObject.activeSelf) { m_OverTime.gameObject.SetActive(true); @@ -243,6 +220,35 @@ } } } private void SetButtonStatus() { var maxMoney = AuctionItem.BuyoutPrice * FamilyAuctionItem.ItemCount; var needMoney = 0; if (FamilyAuctionItem.BidderPrice == 0) { needMoney = AuctionItem.BasePrice * FamilyAuctionItem.ItemCount; } else { needMoney = FamilyAuctionItem.BidderPrice + AuctionItem.BiddingAdd * FamilyAuctionItem.ItemCount; } if (!m_PriceButton.interactable || m_PriceImage.gray) { m_PriceButton.interactable = true; m_PriceImage.gray = false; } if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney) { m_BiddingButton.interactable = true; m_BiddingImage.gray = false; } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } } } } 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) { @@ -214,10 +215,10 @@ TimeSpan timeSpan = timeNow - FullServiceAuction.Time; int minute = (int)timeSpan.TotalMinutes; DateTime overTime = FullServiceAuction.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes); 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,39 +232,15 @@ 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) { needMoney = AuctionItem.BasePrice * FullServiceAuction.ItemCount; } else { needMoney = FullServiceAuction.BidderPrice + AuctionItem.BiddingAdd * FullServiceAuction.ItemCount; } if (!m_PriceButton.interactable || m_PriceImage.gray) { m_PriceButton.interactable = true; m_PriceImage.gray = false; } if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney) { m_BiddingButton.interactable = true; m_BiddingImage.gray = false; } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } SetButtonStatus(); int seconds = AuctionItem.WorldSaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } else if (timeNow < extensionTime)//加时中 if (overTime < extensionTime)//加时中 { SetButtonStatus(); if (!m_OverTime.gameObject.activeSelf) { m_OverTime.gameObject.SetActive(true); @@ -275,6 +252,38 @@ } } } private void SetButtonStatus() { var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount; var needMoney = 0; if (FullServiceAuction.BidderPrice == 0) { needMoney = AuctionItem.BasePrice * FullServiceAuction.ItemCount; } else { needMoney = FullServiceAuction.BidderPrice + AuctionItem.BiddingAdd * FullServiceAuction.ItemCount; } if (!m_PriceButton.interactable || m_PriceImage.gray) { m_PriceButton.interactable = true; m_PriceImage.gray = false; } if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney) { m_BiddingButton.interactable = true; m_BiddingImage.gray = false; } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } } } } 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)) @@ -95,18 +96,18 @@ m_BiddingText.text = Language.Get("PMH_06"); if (type == 0) { int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel. AuctionTaxrate1 * myAuction.BidderPrice * myAuction.ItemCount) / 100);//个人税收 int incomeNumber = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate; int auctionTaxrate = Mathf.FloorToInt((float)(auctionHelpModel. AuctionTaxrate1 * myAuction.BidderPrice) / 100);//个人税收 int incomeNumber = myAuction.BidderPrice - auctionTaxrate; m_Income.text = incomeNumber.ToString(); } else if (type == 1) { int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel. int auctionTaxrate = Mathf.FloorToInt((float)(auctionHelpModel. AuctionTaxrate2 * myAuction.BidderPrice) / 100);//仙盟税收 int number = myAuction.BidderPrice - auctionTaxrate; int incomeMax =Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100); int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count); int incomeMax = Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100); int incomeNumber = Mathf.CeilToInt((float)number / myAuction.FamilyPlayerIDList.Count); if (incomeMax >= incomeNumber) { m_Income.text = incomeNumber.ToString(); @@ -144,7 +145,7 @@ } else { m_JadeNumber.text = auctionItem.BasePrice.ToString(); m_JadeNumber.text = 0.ToString(); } } @@ -157,20 +158,19 @@ TimeSpan timeSpan = timeNow - MyAuction.Time; int minute = (int)timeSpan.TotalMinutes; DateTime overTime = MyAuction.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes); 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)); } else if (timeNow < extensionTime)//加时中 if (overTime < extensionTime)//加时中 { if (!m_OverTime.gameObject.activeSelf) { @@ -183,6 +183,12 @@ } } } private void SetButtonStatus() { } } } 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
@@ -46,9 +46,10 @@ return; } m_NeedImage.SetActive(false); m_ParticipateImage.SetActive(false); 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)) @@ -82,10 +83,8 @@ { m_NeedImage.SetActive(true); } AuctionItemClass _biddingItemInfo = null; if (model.BiddingItemInfoDic.ContainsKey(GUIID))//参与了竞价的物品 { _biddingItemInfo = model.BiddingItemInfoDic[GUIID]; var biddingItemInfo = model.BiddingItemInfoDic[GUIID]; m_ParticipateImage.SetActive(true); if (biddingItemInfo.BidderID == playerId)//判断是否最高竞价 @@ -95,7 +94,7 @@ else { m_HighestPriceImage.SetActive(false); } } if (myAuction.BidderPrice != 0) @@ -137,29 +136,13 @@ } else { if (_biddingItemInfo == null) { needJade = myAuction.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount; } else { needJade = _biddingItemInfo.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount; } needJade = myAuction.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount; } if (auctionItem.BuyoutPrice != 0 && needJade > priceMax)//竞价价格永远不能大于最高价 { needJade = priceMax; } if (_biddingItemInfo == null) { m_JadeNumber.text = myAuction.BidderPrice.ToString(); } else { m_JadeNumber.text = _biddingItemInfo.BidderPrice.ToString(); } m_JadeNumber.text = myAuction.BidderPrice.ToString(); m_JadeNumber1.text = priceMax.ToString(); if (auctionItem.BuyoutPrice == 0) { @@ -219,10 +202,10 @@ TimeSpan timeSpan = timeNow - MyFocusItem.Time; int minute = (int)timeSpan.TotalMinutes; DateTime overTime = MyFocusItem.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes); DateTime extensionTime = MyFocusItem.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime); if (minute < AuctionItem.NoticeSaleMinutes)//预热中 { m_OverTime.gameObject.SetActive(false); if (m_PriceButton.interactable) { m_PriceButton.interactable = false; @@ -236,39 +219,15 @@ 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) { needMoney = AuctionItem.BasePrice * MyFocusItem.ItemCount; } else { needMoney = MyFocusItem.BidderPrice + AuctionItem.BiddingAdd * MyFocusItem.ItemCount; } if (!m_PriceButton.interactable || m_PriceImage.gray) { m_PriceButton.interactable = true; m_PriceImage.gray = false; } if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney) { m_BiddingButton.interactable = true; m_BiddingImage.gray = false; } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } SetButtonStatus(); int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } else if (timeNow < extensionTime)//加时中 if (overTime < extensionTime)//加时中 { SetButtonStatus(); if (!m_OverTime.gameObject.activeSelf) { m_OverTime.gameObject.SetActive(true); @@ -281,6 +240,36 @@ } } private void SetButtonStatus() { var maxMoney = AuctionItem.BuyoutPrice * MyFocusItem.ItemCount; var needMoney = 0; if (MyFocusItem.BidderPrice == 0) { needMoney = AuctionItem.BasePrice * MyFocusItem.ItemCount; } else { needMoney = MyFocusItem.BidderPrice + AuctionItem.BiddingAdd * MyFocusItem.ItemCount; } if (!m_PriceButton.interactable || m_PriceImage.gray) { m_PriceButton.interactable = true; m_PriceImage.gray = false; } if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney) { m_BiddingButton.interactable = true; m_BiddingImage.gray = false; } if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0) { m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } } } } System/Auction/MyFocusWin.cs
@@ -42,7 +42,7 @@ { model.AttentionAuctionItemUdate += ResetUpdate; model.ClearAuctionUpdate += ResetUpdate; model.RefreshAuctionItemUpdate -= AuctionItemUpdate;//刷新 model.RefreshAuctionItemUpdate += AuctionItemUpdate;//刷新 model.FamilyAuctionItemUpdate += ResetUpdate; model.AddAuctionItemInfoUpdate += AddAuctionItemInfoUpdate; model.BiddingItemInfoUpdate += ResetUpdate; @@ -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; }
@@ -114,7 +114,7 @@ { var guid = href.mSplits["auctionbidding"]; guid = guid.Trim('\"'); AuctionInquiry.Instance.SendLocationQuery(guid);//定位查询 AuctionInquiry.Instance.JumpAuctionWin(guid);//定位查询 //--竞价 } } System/Role/MagicianModel.cs
@@ -266,7 +266,7 @@ } #region 红点 public const int MAGICAIN_REDPOINT = 10103; public const int MAGICAIN_REDPOINT = 10102; public const int MAGICAIN_INTERVAL = 100; public Dictionary<int, Redpoint> redpointDict = new Dictionary<int, Redpoint>(); Redpoint magicianPoint = new Redpoint(101, MAGICAIN_REDPOINT); System/Role/ReikiRootModel.cs
@@ -51,9 +51,7 @@ public int maxQuality { get; private set; } public const int FUNCTION = 36; public readonly Redpoint redpoint = new Redpoint(10101, 1010101); public readonly Redpoint redpoint = new Redpoint(101, 10103); public event Action onCacheFreePointRefresh; public event Action onReikiRootPointRefresh; @@ -296,6 +294,22 @@ return value; } public static string GetQualityLabel(int quality) { switch (quality) { case 1: case 2: case 3: case 4: case 5: case 6: return Language.Get(StringUtility.Contact("ReikiRootQuality_", quality)); default: return Language.Get(StringUtility.Contact("ReikiRootQuality_", 1)); } } public void ReceivePackage(HB107_tagMCRolePointInfo package) { for (int i = 0; i < package.PointAttrIDCount; i++) System/Role/ReikiRootPointBehaviour.cs
@@ -8,7 +8,6 @@ public class ReikiRootPointBehaviour : MonoBehaviour { [SerializeField] Text m_PropertyName; [SerializeField] Text m_PropertyValue; [SerializeField] Text m_Point; [SerializeField] Button m_Add; [SerializeField] Button m_Sub; @@ -42,6 +41,8 @@ bool isPointAdd = false; bool isPointSub = false; int cacheQuality = 0; int coroutineCount = 0; static WaitForSeconds waitSpeedFaster = new WaitForSeconds(0.05f); @@ -62,24 +63,36 @@ { parent = win; this.id = id; DisplayBase(); cacheQuality = 0; DisplayPoint(); model.onReikiRootPointRefresh += OnReikiRootPointRefresh; } void DisplayBase() { var propertyConfig = PlayerPropertyConfig.Get(id); m_PropertyName.text = propertyConfig.Name; var qualiaty = model.GetReikiRootQuality(id); m_PropertyName.color = UIHelper.GetUIColor(qualiaty, true); m_PropertyValue.text = UIHelper.GetPropertyMapPlayerData((PropertyType)id).ToString(); } void DisplayPoint() { m_Point.text = point.ToString(); var original = model.GetReikiRootPoint(id); var addLabel = point == 0 ? string.Empty : UIHelper.AppendColor(TextColType.Green, "+" + point, true); var quality = model.GetReikiRootQuality(id, original + point); var areaPoint = model.GetQualityPoint(id, quality + 1); if (areaPoint == 0) { m_Point.text = StringUtility.Contact(original, addLabel); } else { m_Point.text = StringUtility.Contact(original, addLabel, "/", areaPoint); } if (cacheQuality != quality) { var propertyConfig = PlayerPropertyConfig.Get(id); m_PropertyName.text = StringUtility.Contact(propertyConfig.Name, ReikiRootModel.GetQualityLabel(quality)); m_PropertyName.color = UIHelper.GetUIColor(quality, true); cacheQuality = quality; } } private void OnAddDown(GameObject go) @@ -142,7 +155,14 @@ private void OnReikiRootPointRefresh() { DisplayBase(); if (point == 0) { DisplayPoint(); } else { point = 0; } } private void OpenKeyboard() System/Role/ReikiRootRuleWin.cs
New file @@ -0,0 +1,23 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Thursday, March 28, 2019 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class ReikiRootRuleWin : HowToPlayWin { } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 70cc833dda7ed2e40a98ba014ab16b95 timeCreated: 1553762754 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/Role/ReikiRootWin.cs
@@ -21,7 +21,7 @@ [SerializeField] Text m_FreePoint; [SerializeField] Button m_Recommend; [SerializeField] Button m_Confirm; [SerializeField] Button m_Close; [SerializeField] Button m_Rule; Dictionary<int, int> currentPropertyDict = new Dictionary<int, int>(); Dictionary<int, int> upPropertyDict = new Dictionary<int, int>(); @@ -44,7 +44,7 @@ { m_Recommend.AddListener(OnRecommend); m_Confirm.AddListener(Confirm); m_Close.AddListener(CloseClick); m_Rule.AddListener(OnRule); m_NumKeyboard.onValueChange.AddListener(OnPointValChange); m_NumKeyboard.onConfirm.AddListener((bool isOk) => @@ -229,6 +229,12 @@ } } private void OnRule() { ModelCenter.Instance.GetModel<HowToPlayModel>().ruleId = 44; WindowCenter.Instance.Open<ReikiRootRuleWin>(); } private void OnCacheFreePointRefresh() { DisplayFreePoint(); @@ -239,10 +245,6 @@ { if (dataType == PlayerDataType.FreePoint) { foreach (var reikiRootPoint in m_ReikiRootPoints) { reikiRootPoint.point = 0; } if (model.cacheFreePoint == model.freePoint) { OnCacheFreePointRefresh(); System/Role/RolePanel.cs
@@ -15,6 +15,7 @@ [SerializeField] FunctionButtonGroup buttonGroup; [SerializeField] FunctionButton functionButtonRole; [SerializeField] FunctionButton functionButtonMagician; [SerializeField] FunctionButton m_ReikiRoot; [SerializeField] FunctionButton m_GatherSoul; [SerializeField] FunctionButton m_FashionDress; @@ -42,7 +43,6 @@ [SerializeField] RectTransform m_ContainerExp; [SerializeField] Slider m_ExpSlider; [SerializeField] Text m_WorldExp; [SerializeField] Button m_AddPoint; [SerializeField] Button m_PlayerPropertyBtn; [SerializeField] Button m_TitleBtn; [SerializeField] Button m_RenameBtn; @@ -131,18 +131,6 @@ private void OnAttrExplainClick() { WindowCenter.Instance.Open<RoleAttrWin>(); } private void OnPromoteClick() { if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.ReikiRoot)) { WindowCenter.Instance.Open<ReikiRootWin>(); } else { FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.ReikiRoot); } } private void OnRefreshPlayerInfo(PlayerDataType refreshType) @@ -277,8 +265,8 @@ { functionButtonRole.onClick.AddListener(OnFuncRole); functionButtonMagician.onClick.AddListener(OnFuncMagician); m_AddPoint.onClick.AddListener(OnPromoteClick); m_GatherSoul.onClick.AddListener(GatherSoul); m_ReikiRoot.onClick.AddListener(ReikiRoot); m_FashionDress.onClick.AddListener(OpenFashionDress); m_PlayerPropertyBtn.onClick.AddListener(OnAttrExplainClick); m_TitleBtn.onClick.AddListener(OnDesignationClick); @@ -289,6 +277,13 @@ m_CloseBtn.onClick.AddListener(CloseClick); } private void ReikiRoot() { CloseChild(); WindowCenter.Instance.Open<ReikiRootWin>(); functionOrder = m_ReikiRoot.order; } private void GatherSoul() { CloseChild(); System/Strengthening/HowToPlayWin.cs
@@ -9,7 +9,7 @@ { [SerializeField] Text m_Title; [SerializeField] Text m_Description; [SerializeField] RectTransform desRect; [SerializeField] ScrollRect m_Scroller; [SerializeField] Button m_CloseBtn; [SerializeField] Button m_SureBtn; @@ -44,7 +44,7 @@ protected override void OnPreOpen() { desRect.anchoredPosition3D = new Vector3(desRect.anchoredPosition3D.x,140,0); m_Scroller.verticalNormalizedPosition = 1f; var config = RuleConfig.Get(model.ruleId); if (!string.IsNullOrEmpty(config.Title)) { System/Tip/PromoteDetailsWin.cs
@@ -78,7 +78,7 @@ WindowCenter.Instance.Open<KnapSackWin>(); break; case RolePromoteModel.PromoteDetailType.AddPoint: WindowCenter.Instance.Open<ReikiRootWin>(); WindowCenter.Instance.Open<RolePanel>(false, 2); break; case RolePromoteModel.PromoteDetailType.EquipStrength: //WindowCenter.Instance.Open<EquipReinforceWin>(); @@ -93,7 +93,7 @@ WindowCenter.Instance.Open<RunePanel>(); break; case RolePromoteModel.PromoteDetailType.GodWeapon: WindowCenter.Instance.Open<RolePanel>(false, 3); WindowCenter.Instance.Open<RolePanel>(false, 1); break; case RolePromoteModel.PromoteDetailType.TreasurePotential: break; System/WindowJump/WindowJumpMgr.cs
@@ -250,7 +250,7 @@ SetJumpLogic<RealmWin>(_tagWinSearchModel.TABID); break; case JumpUIType.RolePoint: SetJumpLogic<ReikiRootWin>(_tagWinSearchModel.TABID); SetJumpLogic<RolePanel>(2); break; case JumpUIType.MainTask: TaskModel taskDatas = ModelCenter.Instance.GetModel<TaskModel>(); @@ -417,7 +417,7 @@ SetJumpLogic<KnapSackWin>(_tagWinSearchModel.TABID); break; case JumpUIType.RebornOpenAddPoint: SetJumpLogic<ReikiRootWin>(_tagWinSearchModel.TABID); SetJumpLogic<RolePanel>(2); break; case JumpUIType.RebornOpenHourse: SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);
