| System/Auction/FamilyAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FullServiceAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyAuctionCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/MyFocusCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/TransactionRecordWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Auction/FamilyAuctioncell.cs
@@ -110,8 +110,8 @@ } m_PriceButton.SetListener(() => //一口价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？"; int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_02", auctionItem.BuyoutPrice); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { @@ -131,7 +131,7 @@ m_BiddingButton.SetListener(() => //竞价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = "是否花费" + needJade + "参与竞价？"; string str = Language.Get("PMH_01", needJade); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { @@ -167,8 +167,8 @@ m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds; m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始"; 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)//拍卖中 { @@ -183,7 +183,7 @@ m_BiddingImage.gray = false; } int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } } } System/Auction/FullServiceAuctioncell.cs
@@ -129,7 +129,7 @@ m_PriceButton.SetListener(() => //一口价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？"; string str = Language.Get("PMH_02", auctionItem.BuyoutPrice); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { @@ -150,7 +150,7 @@ m_BiddingButton.SetListener(() => //竞价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = "是否花费" + needJade + "参与竞价？"; string str = Language.Get("PMH_01", needJade); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { @@ -166,118 +166,7 @@ }); }); } //public override void Refresh(CellView cell) //{ // m_NeedImage.SetActive(false); // m_ParticipateImage.SetActive(false); // m_BiddingTextObj.SetActive(false); // m_HighestPriceImage.SetActive(false); // m_EquipmentScoreObj.SetActive(false); // var index = cell.index; // if (index >= model.FullServiceAuctionList.Count) // { // DebugEx.LogError("超出数据存储范围"); // return; // } // var fullServiceAuction = model.FullServiceAuctionList[index]; // if (index == 1) // { // var sendNumber = AuctionInquiry.Instance.GetSendNumber(); // if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool) // { // AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 2); // auctionHelpModel.Wait = false; // } // } else if (index== model.FullServiceAuctionList.Count-2) // { // var sendNumber = AuctionInquiry.Instance.GetSendNumber(); // if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool) // { // AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 1); // auctionHelpModel.Wait = false; // } // } // FullServiceAuction = fullServiceAuction; // var playerId = PlayerDatas.Instance.baseData.PlayerID; // var auctionItem = AuctionItemConfig.Get(fullServiceAuction.ItemID); // var itemConfig = ItemConfig.Get(fullServiceAuction.ItemID); // if (itemConfig == null) // { // DebugEx.LogError("物品表没有找到该物品，物品ID为" + fullServiceAuction.ItemID); // return; // } // if (auctionItem == null) // { // DebugEx.LogError("拍卖物品表没有找到该物品，物品ID为"+ fullServiceAuction.ItemID); // return; // } // AuctionItem = auctionItem; // if (model.BiddingItemInfoDic.ContainsKey(fullServiceAuction.ItemGUID))//参与了竞价的物品 // { // var biddingItemInfo = model.BiddingItemInfoDic[fullServiceAuction.ItemGUID]; // m_ParticipateImage.SetActive(true); // if (biddingItemInfo.BidderID == playerId)//判断是否最高竞价 // { // m_HighestPriceImage.SetActive(true); // } // else // { // m_BiddingTextObj.SetActive(true); // } // } // ItemCellModel cellModel = new ItemCellModel(fullServiceAuction.ItemID, true, // (ulong)fullServiceAuction.ItemCount, itemConfig.BindType); // m_ItemCell.Init(cellModel); // m_ItemName.text = itemConfig.ItemName; // if (itemConfig.EquipPlace != 0) // { // m_EquipmentScoreObj.SetActive(true); // // m_Score.text // } // int needJade = 0; // if (fullServiceAuction.BidderPrice == 0) // { // needJade = auctionItem.BasePrice; // } // else // { // needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd; // } // m_JadeNumber.text = needJade.ToString(); // m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString(); // m_PriceButton.SetListener(()=> //一口价 // { // int jade = (int)PlayerDatas.Instance.baseData.diamond; // string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？"; // ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { // if (jade >= auctionItem.BuyoutPrice) // { // AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, auctionItem.BuyoutPrice); // } // else // { // WindowCenter.Instance.Open<RechargeTipWin>(); // } // }); // }); // m_JadeNumber2.text = needJade.ToString(); // m_BiddingButton.SetListener(()=> //竞价 // { // int jade = (int)PlayerDatas.Instance.baseData.diamond; // string str = "是否花费" + needJade + "参与竞价？"; // ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { // if (jade >= needJade) // { // AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, needJade); // } // else // { // WindowCenter.Instance.Open<RechargeTipWin>(); // } // }); // }); //} private void LateUpdate() { if (AuctionItem != null && FullServiceAuction != null) @@ -298,7 +187,7 @@ m_BiddingImage.gray = true; } int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds; m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始"; m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds)); } else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中 { @@ -313,7 +202,7 @@ m_BiddingImage.gray = false; } int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } } } System/Auction/MyAuctionCell.cs
@@ -68,11 +68,19 @@ m_Income.text = 0.ToString(); if (myAuction.BidderPrice == 0) { m_BiddingText.text = "暂无出价"; m_BiddingText.text = Language.Get("PMH_05"); } else { m_BiddingText.text = "竞价中..."; if (myAuction.AuctionType == 0)//是否仙盟拍品流拍至全服拍品 { m_BiddingText.text = Language.Get("PMH_07"); } else { m_BiddingText.text = Language.Get("PMH_06"); } if (type == 0) { int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel. @@ -126,13 +134,13 @@ int minute = (int)timeSpan.TotalMinutes; if (minute < AuctionItem.NoticeSaleMinutes)//预热中 { int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds; m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始"; 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)//拍卖中 { int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } } } System/Auction/MyFocusCell.cs
@@ -119,8 +119,8 @@ m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString(); m_PriceButton.SetListener(() => //一口价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = "是否花费" + auctionItem.BuyoutPrice + "立即拍下商品？"; int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_02", auctionItem.BuyoutPrice); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { @@ -138,8 +138,8 @@ m_JadeNumber2.text = (needJade).ToString(); m_BiddingButton.SetListener(() => //竞价 { int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = "是否花费" + needJade + "参与竞价？"; int jade = (int)PlayerDatas.Instance.baseData.diamond; string str = Language.Get("PMH_01", needJade); ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => { if (isOk) { @@ -175,8 +175,8 @@ m_BiddingButton.interactable = false; m_BiddingImage.gray = true; } int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds; m_TimeText.text = TimeUtility.SecondsToHMS(seconds) + "后开始"; 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)//拍卖中 { @@ -191,7 +191,7 @@ m_BiddingImage.gray = false; } int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60); m_TimeText.text = "剩余" + TimeUtility.SecondsToHMS(seconds); m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds)); } } } System/Auction/TransactionRecordWin.cs
@@ -115,9 +115,58 @@ Text transactionStatusText = cell.transform.Find("TransactionStatusText").GetComponent<Text>(); Text timeText = cell.transform.Find("TimeText").GetComponent<Text>(); ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1, itemConfig.BindType); GameObject SuccessfulBiddingObj = cell.transform.Find("SuccessfulBiddingObj").gameObject;//竞拍成功(竞拍成功) Text SuccessfulBiddingText= cell.transform.Find("SuccessfulBiddingObj/SuccessfulBiddingText").GetComponent<Text>(); Text JadeMoney= cell.transform.Find("SuccessfulBiddingObj/JadeMoney").GetComponent<Text>(); GameObject AuctionFailedObj = cell.transform.Find("AuctionFailedObj").gameObject;//竞拍失败 Text JadeMoney_1 = cell.transform.Find("AuctionFailedObj/JadeMoney").GetComponent<Text>(); switch (auctionRecord.RecordResult) { case 0://流拍 transactionStatusText.gameObject.SetActive(true); SuccessfulBiddingObj.SetActive(false); AuctionFailedObj.SetActive(false); if (AuctionType == 0) { transactionStatusText.text = Language.Get("PMH_11"); } else if (AuctionType==1) { transactionStatusText.text = Language.Get("PMH_12"); } break; case 1://拍卖成交（竞拍成功） SuccessfulBiddingObj.SetActive(true); transactionStatusText.gameObject.SetActive(false); AuctionFailedObj.SetActive(false); SuccessfulBiddingText.text = Language.Get("PMH_13"); JadeMoney.text = auctionRecord.BidderPrice.ToString(); break; case 2://回收 transactionStatusText.gameObject.SetActive(true); SuccessfulBiddingObj.SetActive(false); AuctionFailedObj.SetActive(false); transactionStatusText.text = Language.Get("PMH_14"); break; case 3://竞价成功 SuccessfulBiddingObj.SetActive(true); transactionStatusText.gameObject.SetActive(false); AuctionFailedObj.SetActive(false); SuccessfulBiddingText.text = Language.Get("PMH_15", auctionRecord.BidderName); JadeMoney.text = auctionRecord.BidderPrice.ToString(); break; case 4://竞价失败 AuctionFailedObj.SetActive(true); SuccessfulBiddingObj.SetActive(false); transactionStatusText.gameObject.SetActive(false); JadeMoney_1.text= auctionRecord.BidderPrice.ToString(); break; } itemCell.Init(cellModel); textName.text = itemConfig.ItemName; transactionStatusText.text = GetRecordResultName(auctionRecord.RecordResult); timeText.text = auctionRecord.TimeStr; } @@ -156,39 +205,14 @@ switch (index) { case 0: str = "我的拍品"; str = Language.Get("PMH_08"); break; case 1: str = "仙盟拍品"; str = Language.Get("PMH_09"); break; case 2: str = "我的竞拍"; str = Language.Get("PMH_10"); break; } return str; } private string GetRecordResultName(int index) { string str = string.Empty; switch (index) { case 0: str = "流拍"; break; case 1: str = "拍卖成交"; break; case 2: str = "回收"; break; case 3: str = "竞价成功"; break; case 4: str = "竞价失败"; break; } return str; }
