| Fight/GameActor/GActorPlayerBase.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/AuctionHelpModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FullServiceAuctionWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Auction/FullServiceAuctioncell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/GameActor/GActorPlayerBase.cs
@@ -591,9 +591,9 @@ return; } int _resID = JobSetup.BaseEquip[1]; var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance(); EquipInfo _equipInfo; int _resID = JobSetup.BaseEquip[1]; // 如果是套装位置 if (index == (int)RoleEquipType.FashionWeapon) @@ -602,15 +602,15 @@ if (itemID == 0) { // 寻找原身上装备, 如果有的话就重置此次要换装的道具id if (m_EquipDict.TryGetValue((int)RoleEquipType.Weapon, out _equipInfo)) if (apperance.weapon != 0) { itemID = _equipInfo.itemID; itemID = (uint)apperance.weapon; } } } else if (index == (int)RoleEquipType.Weapon) { if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon)) if (apperance.fashionWeapon != 0) { return; } @@ -708,14 +708,15 @@ { return; } var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance(); int _baseHandResID = ModelResConfig.GetHandByClothesID((int)ClothesItemID); int _resID = _baseHandResID; if (JobSetup.Job == 2) { _resID = JobSetup.BaseEquip[2]; } EquipInfo _equipInfo; // 如果是套装位置 if (index == (int)RoleEquipType.FashionWeapon2) @@ -724,15 +725,15 @@ if (itemID == 0) { // 寻找原身上装备, 如果有的话就重置此次要换装的道具id if (m_EquipDict.TryGetValue((int)RoleEquipType.Weapon2, out _equipInfo)) if (apperance.secondary != 0) { itemID = _equipInfo.itemID; itemID = (uint)apperance.secondary; } } } else if (index == (int)RoleEquipType.Weapon2) { if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2)) if (apperance.fashionSecondary != 0) { return; } @@ -795,7 +796,7 @@ } } if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2)) if (apperance.fashionSecondary != 0) { SwitchHand(true); } @@ -949,7 +950,7 @@ return; } EquipInfo _equipInfo; var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance(); // 换装ID int _resID = JobSetup.BaseEquip[0]; @@ -961,15 +962,15 @@ if (itemID == 0) { // 寻找原身上装备, 如果有的话就重置此次要换装的道具id if (m_EquipDict.TryGetValue((int)RoleEquipType.Clothes, out _equipInfo)) if (apperance.clothes != 0) { itemID = _equipInfo.itemID; itemID = (uint)apperance.clothes; } } } else if (index == (int)RoleEquipType.Clothes) { if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionClothes)) if (apperance.fashionClothes != 0) { return; } @@ -1134,13 +1135,13 @@ // 决定副手逻辑 // 如果当前是时装副手, 则装备时装手臂 // 如果当前是普通副手, 则卸下手臂 if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2)) if (apperance.fashionSecondary != 0) { SwitchHand(true); } else { if (!m_EquipDict.ContainsKey((int)RoleEquipType.Weapon2)) if (apperance.fashionSecondary == 0) { SwitchHand(true); } @@ -1306,20 +1307,16 @@ if (onOrOff) { EquipInfo _equipInfo; var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance(); int _itemID = 7000; if (!m_EquipDict.TryGetValue((int)RoleEquipType.FashionClothes, out _equipInfo)) if (apperance.fashionClothes == 0) { if (!m_EquipDict.TryGetValue((int)RoleEquipType.Clothes, out _equipInfo)) if (apperance.clothes == 0) { _itemID = 7000; } } if (_equipInfo.itemID != 0) { _itemID = (int)_equipInfo.itemID; } int _resID = 7000; System/Auction/AuctionHelpModel.cs
@@ -48,6 +48,12 @@ get { return wait; } set { wait = value; } } public bool isOpenPanel = true; public bool IsOpenPanel { get { return isOpenPanel; } set { isOpenPanel = value; } } public override void Init() { var AuctionTaxrateConfig = FuncConfigConfig.Get("AuctionTaxrate"); System/Auction/FullServiceAuctionWin.cs
@@ -26,11 +26,12 @@ [SerializeField] Button m_TypeTipBtn; [SerializeField] Text m_JobTipText; [SerializeField] Text m_TypeTipText; List<AuctionItemClass> FullServiceAuctionListSort = new List<AuctionItemClass>();//全服拍品列表 List<AuctionItemClass> FullServiceAuctionListSort = new List<AuctionItemClass>();//全服拍品列表 AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } } AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } } private bool IsSendBool = true; private int Times = 0; protected override void BindController() { m_ScrollerController.OnRefreshCell += OnRefreshGridCell; @@ -48,25 +49,28 @@ protected override void OnPreOpen() { IsSendBool = true; Times = 0; auctionHelpModel.isOpenPanel = true; IsSendBool = false; GlobalTimeEvent.Instance.secondEvent += secondEvent; model.FullServiceAuctionUpdate += FullServiceAuctionUpdate;//数据请求刷新 model.RefreshAuctionItemUpdate += RefreshAuctionItemUpdate;//刷新 model.ClearAuctionUpdate += ClearAuctionUpdate;//清除 model.BiddingItemInfoUpdate += BiddingItemInfoUpdate;//竞价物品信息刷新 GlobalTimeEvent.Instance.secondEvent += secondEvent; model.BiddingItemInfoUpdate += BiddingItemInfoUpdate;//竞价物品信息刷新 Reset(); CloseTip(); ListSort(); OnCreateGridLineCell(m_ScrollerController); OnCreateGridLineCellJob(m_ScrollerControllerJob); OnCreateGridLineCellType(m_ScrollerControllerType); OnCreateGridLineCellType(m_ScrollerControllerType); OnCreateGridLineCellItem(m_ScrollerControllerItem); SetTipText(); } protected override void OnAfterOpen() { } protected override void OnPreClose() @@ -77,7 +81,7 @@ model.BiddingItemInfoUpdate -= BiddingItemInfoUpdate;//竞价物品信息刷新 GlobalTimeEvent.Instance.secondEvent -= secondEvent; } protected override void OnAfterClose() { } @@ -85,6 +89,11 @@ private void secondEvent() { Times += 1; if (Times >= 3 && auctionHelpModel.isOpenPanel) { auctionHelpModel.isOpenPanel = false; } if (IsSendBool) { IsSendBool = false; @@ -105,7 +114,7 @@ } private void BiddingItemInfoUpdate() { } private void OnClickJobTipBtn() { @@ -118,7 +127,7 @@ } private void OnCreateGridLineCell(ScrollerController gridCtrl) { gridCtrl.Refresh(); for (int i = 0; i < auctionHelpModel.FullServiceAuctionList.Count; i++) { @@ -172,7 +181,7 @@ if (index != -1) { var fullServiceAuction = auctionHelpModel.FullServiceAuctionList[index]; if (fullServiceAuction.ChooseItem1 != null && fullServiceAuction.ChooseItem1.Length!=0) if (fullServiceAuction.ChooseItem1 != null && fullServiceAuction.ChooseItem1.Length != 0) { gridCtrl.Refresh(); for (int i = 0; i < fullServiceAuction.ChooseItem1.Length; i++) @@ -200,7 +209,7 @@ if (index != config.JobEntry) { auctionHelpModel.FullServiceAuctionDic[selectedGenreNow].JobEntry = index; IsSendBool = true; IsSendBool = true; SetTipText(); } }); @@ -217,7 +226,7 @@ if (index != -1) { var fullServiceAuction = auctionHelpModel.FullServiceAuctionList[index]; if (fullServiceAuction.ChooseItem2 != null && fullServiceAuction.ChooseItem2.Length!=0) if (fullServiceAuction.ChooseItem2 != null && fullServiceAuction.ChooseItem2.Length != 0) { gridCtrl.Refresh(); for (int i = 0; i < fullServiceAuction.ChooseItem2.Length; i++) @@ -245,7 +254,7 @@ if (index != config.TypeEntry) { auctionHelpModel.FullServiceAuctionDic[selectedGenreNow].TypeEntry = index; IsSendBool=true; IsSendBool = true; SetTipText(); } }); @@ -271,9 +280,9 @@ else { model.LocationQuery = false; } } gridCtrl.Refresh(); for (int i = 0; i <FullServiceAuctionListSort.Count; i++) for (int i = 0; i < FullServiceAuctionListSort.Count; i++) { gridCtrl.AddCell(ScrollerDataType.Header, i); } @@ -297,14 +306,14 @@ { AuctionInquiry.Instance.SendQueryAuction(string.Empty, sendNumber, 1); } } private void CloseTip() { m_JobTip.SetActive(false); m_TypeTip.SetActive(false); } private void SetTipText() private void SetTipText() { var selectedGenreNow = auctionHelpModel.SelectedGenreNow; if (auctionHelpModel.FullServiceAuctionDic.ContainsKey(selectedGenreNow)) @@ -323,7 +332,7 @@ } } private void ListSort() private void ListSort() { FullServiceAuctionListSort.Clear(); var sendNumber = AuctionInquiry.Instance.GetSendNumber(); @@ -343,7 +352,7 @@ { FullServiceAuctionListSort.Add(vlaue); } } } } FullServiceAuctionListSort.Sort(Compare); } @@ -360,7 +369,7 @@ if (havex1.CompareTo(havey1) != 0)//是否参与 { return -havex1.CompareTo(havey1); } } return 1; } private bool IsHighestPrice(string GUID) @@ -383,7 +392,7 @@ isBool = true; } return isBool; } } } } System/Auction/FullServiceAuctioncell.cs
@@ -55,7 +55,7 @@ if (index < 5) { var sendNumber = AuctionInquiry.Instance.GetSendNumber(); if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool) if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool && !auctionHelpModel.isOpenPanel) { AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 2); auctionHelpModel.Wait = false; @@ -64,7 +64,7 @@ else if (index >= model.FullServiceAuctionList.Count - 3) { var sendNumber = AuctionInquiry.Instance.GetSendNumber(); if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool) if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool && !auctionHelpModel.isOpenPanel) { AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 1); auctionHelpModel.Wait = false;
