3335 拍卖行修改

client_linchunjie

2019-04-01 faf2cc75a49a90d5e92ec28aab2e58912a7fc781

3335 拍卖行修改

 System/Auction/AuctionModel.cs

@@ -10,13 +10,6 @@

namespace Snxxz.UI

{
    public class AddAuctionItemInfoClass

    {

        public string ItemGUID;//物品GUID

        public int ItemID;//物品ID

        public bool Bool;

    }

    public class QueryRemainingClass

    {

        public bool UpBool;

@@ -33,10 +26,9 @@
        List<string> m_MyBiddingItemGuids = new List<string>();//拍卖行玩家竞价中的物品信息 

        List<string> m_MyFocusAuctionItemGuids = new List<string>();//拍卖行关注中的拍品详情

        List<string> m_AuctionRecords = new List<string>();//拍卖行玩家拍卖记录

        List<FocusAuctionItem> m_FocusItems = new List<FocusAuctionItem>();//关注的拍品的上架提醒（弹框显示）



        List<int> m_MyFocusItemIds = new List<int>();//关注的物品ID



        public Dictionary<int, AddAuctionItemInfoClass> AddAuctionItemInfoDic = new Dictionary<int, AddAuctionItemInfoClass>();//关注的拍品的上架提醒（弹框显示）



        public QueryRemainingClass QueryRemaining = new QueryRemainingClass();



@@ -45,6 +37,7 @@


        public bool isLocationQuery { get; set; }

        public string locationGuid { get; set; }

        public bool isServerPrepare { get; private set; }



        public event Action myAuctionRefresh;

        public event Action serverAuctionRefresh;//全服拍品数据请求

@@ -55,7 +48,7 @@
        public event Action myFocusAuctionRefresh;//拍卖行关注中的拍品信息变更（信息每次重置）

        public event Action auctionItemRefresh;//拍卖行数据刷新(仅用于数据刷新)

        public event Action onAuctionRemove;//拍卖行物品清除

        public event Action AddAuctionItemInfoUpdate;

        public event Action onFocusAuctionRefresh;



        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }



@@ -68,20 +61,24 @@
        public void OnBeforePlayerDataInitialize()

        {

            isLocationQuery = false;

            isServerPrepare = false;



            m_MyAuctionItemGuids.Clear();

            m_FairyAuctionItemGuids.Clear();

            m_AuctionRecords.Clear();

            AddAuctionItemInfoDic.Clear();

            m_MyBiddingItemGuids.Clear();

            m_MyFocusAuctionItemGuids.Clear();

            m_MyFocusItemIds.Clear();



            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;

        }



        public void OnPlayerLoginOk()

        {

            RefreshRedpoint();

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;



            isServerPrepare = true;

            RefreshRedpoint();

        }





@@ -105,6 +102,7 @@
            {

                m_ServerAuctionItemGuids.Clear();

                m_AuctionItems.Clear();

                m_FocusItems.Clear();

            }

        }



@@ -224,6 +222,17 @@
            return false;

        }



        public bool TryGetFocusAuctionPop(out FocusAuctionItem item)

        {

            item = default(FocusAuctionItem);

            if (m_FocusItems.Count > 0)

            {

                item = m_FocusItems[0];

                return true;

            }

            return false;

        }



        public List<string> GetServerAuctionItems()

        {

            List<string> guids = new List<string>();

@@ -324,6 +333,14 @@
            return m_MyFocusItemIds.Contains(id);

        }



        public void RemoveFocusItemPop()

        {

            if (m_FocusItems.Count > 0)

            {

                m_FocusItems.RemoveAt(0);

            }

        }



        public void ReceivePackage(HB501_tagGCAuctionItemInfo package)// 拍卖行拍卖中的物品信息

        {

            List<string> fullServiceAuctionList = new List<string>();

@@ -365,6 +382,11 @@
            }

            else if (package.QueryDir == 3)//定位查询

            {

                if (WindowCenter.Instance.IsOpen<AuctionHouseWin>())

                {

                    return;

                }

                m_ServerAuctionItemGuids.Clear();

                m_ServerAuctionItemGuids.AddRange(fullServiceAuctionList);

                auctionHelpModel.SelectedGenreNow = 0;

                isLocationQuery = true;

@@ -448,25 +470,31 @@


        public void ReceivePackage(HB504_tagGCAddAuctionItemInfo package)//拍卖行新上架拍品(玩家有关注的拍品 )

        {

            if (!isServerPrepare)

            {

                return;

            }

            for (int i = 0; i < package.AddCount; i++)

            {

                var data = package.AddAuctionItemList[i];

                AddAuctionItemInfoClass addAuctionItemInfo = new AddAuctionItemInfoClass();

                addAuctionItemInfo.ItemGUID = UIHelper.ServerStringTrim(data.ItemGUID);

                addAuctionItemInfo.ItemID = (int)data.ItemID;

                addAuctionItemInfo.Bool = true;

                if (AddAuctionItemInfoDic.ContainsKey(addAuctionItemInfo.ItemID))

                var guid = UIHelper.ServerStringTrim(data.ItemGUID);

                if (m_FocusItems.FindIndex((x) =>

                {

                    AddAuctionItemInfoDic[addAuctionItemInfo.ItemID] = addAuctionItemInfo;

                }

                else

                    return x.itemId == data.ItemID || x.itemGuid.Equals(guid);

                }) != -1)

                {

                    AddAuctionItemInfoDic.Add(addAuctionItemInfo.ItemID, addAuctionItemInfo);

                    continue;

                }

                var focusItem = new FocusAuctionItem()

                {

                    itemGuid = guid,

                    itemId = (int)data.ItemID,

                };

                m_FocusItems.Add(focusItem);

            }

            if (AddAuctionItemInfoUpdate != null)

            if (onFocusAuctionRefresh != null)

            {

                AddAuctionItemInfoUpdate();

                onFocusAuctionRefresh();

            }

        }



@@ -869,6 +897,11 @@
        }

    }

    public struct FocusAuctionItem

    {

        public string itemGuid;//物品GUID

        public int itemId;//物品ID

    }
}



 System/Auction/FullServiceAuctionWin.cs

@@ -58,7 +58,8 @@
            model.serverAuctionRefresh += FullServiceAuctionUpdate;//数据请求刷新
            model.auctionItemRefresh += RefreshAuctionItemUpdate;//刷新
            model.onAuctionRemove += ClearAuctionUpdate;//清除
            model.myBiddingAuctionRefresh += BiddingItemInfoUpdate;//竞价物品信息刷新         
            model.myBiddingAuctionRefresh += BiddingItemInfoUpdate;//竞价物品信息刷新        
            m_ScrollerControllerItem.onValueChange += OnValueChange;
            ResetServerAuctionInquiry();
            CloseTip();



@@ -91,7 +92,24 @@
            model.auctionItemRefresh -= RefreshAuctionItemUpdate;
            model.onAuctionRemove -= ClearAuctionUpdate;

            model.myBiddingAuctionRefresh -= BiddingItemInfoUpdate;//竞价物品信息刷新

            GlobalTimeEvent.Instance.secondEvent -= secondEvent;
            GlobalTimeEvent.Instance.secondEvent -= secondEvent;

            m_ScrollerControllerItem.onValueChange -= OnValueChange;
        }



        private void OnValueChange(Vector2 delta)

        {

            if (delta.y >= 1)

            {

                if (!auctionHelpModel.isOpenPanel && auctionHelpModel.Wait && model.QueryRemaining.UpBool)

                {

                    var inquiryIndex = AuctionInquiry.Instance.GetInquiryIndex();

                    if (itemGuids.Count > 0)

                    {

                        model.SendInquiryServerAcution(inquiryIndex, itemGuids[0], 2);

                        auctionHelpModel.Wait = false;

                    }

                }

            }

        }



        protected override void OnAfterClose()
@@ -281,6 +299,7 @@


        private void OnCreateGridLineCellItem(ScrollerController gridCtrl)

        {

            itemGuids.Clear();

            if (!model.isLocationQuery && !model.QueryRemaining.UpBool)

            {

                PushMyBiddingItems();

@@ -349,8 +368,6 @@

        private void PushMyBiddingItems()

        {

            itemGuids.Clear();



            var index = AuctionInquiry.Instance.GetInquiryIndex();

            if (index == 0)

            {


 System/Auction/FullServiceAuctioncell.cs

@@ -14,6 +14,7 @@

    public class FullServiceAuctioncell : MonoBehaviour

    {

        [SerializeField] Transform m_Container;

        [SerializeField] GameObject m_NeedImage;//需要

        [SerializeField] GameObject m_ParticipateImage;//参与竞价

        [SerializeField] ItemCell m_ItemCell;//物品

@@ -57,9 +58,13 @@


        public void GetFullServiceAuctionGUID(string guid, int index, int totalCount)

        {

            m_Container.gameObject.SetActive(!string.IsNullOrEmpty(guid));



            m_NeedImage.SetActive(false);

            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);



            this.auctionItemGuid = guid;



            AuctionItem auctionItem;

            if (!model.TryGetServerAuctionItem(guid, out auctionItem))

@@ -67,19 +72,17 @@
                return;

            }



            this.auctionItemGuid = guid;



            #region 滚动查询

            var inquiryIndex = AuctionInquiry.Instance.GetInquiryIndex();

            if (index < 2)

            {

                if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool)

                if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool && !auctionHelpModel.isOpenPanel)

                {

                    model.SendInquiryServerAcution(inquiryIndex, auctionItem.itemGuid, 2);

                    auctionHelpModel.Wait = false;

                }

            }

            else if (index >= totalCount - 3)

            else if (index >= totalCount - 5)

            {

                if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool && !auctionHelpModel.isOpenPanel)

                {

@@ -145,6 +148,10 @@


        private void LateUpdate()

        {

            if (string.IsNullOrEmpty(auctionItemGuid))

            {

                return;

            }

            timer += Time.deltaTime;

            if (timer >= 0.5f)

            {


 System/Auction/MyAuctionWin.cs

@@ -43,7 +43,7 @@
            model.onAuctionRemove += ResetUpdate;

            model.auctionItemRefresh += AuctionItemUpdate;//刷新
            model.fairyAuctionRefresh += ResetUpdate;
            model.AddAuctionItemInfoUpdate += ResetUpdate;
            model.onFocusAuctionRefresh += ResetUpdate;
            model.myAuctionRefresh += ResetUpdate;
        }

@@ -53,7 +53,7 @@
            model.onAuctionRemove -= ResetUpdate;

            model.auctionItemRefresh -= AuctionItemUpdate;//刷新

            model.fairyAuctionRefresh -= ResetUpdate;

            model.AddAuctionItemInfoUpdate -= ResetUpdate;

            model.onFocusAuctionRefresh -= ResetUpdate;

            model.myAuctionRefresh -= ResetUpdate;
        }


 System/Auction/MyFocusAuctionBehaviour.cs

New file
@@ -0,0 +1,110 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, March 08, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using System.Collections.Generic;

using System;

namespace Snxxz.UI

{
    public class MyFocusAuctionBehaviour : MonoBehaviour

    {
        [SerializeField] Transform m_Container;

        [SerializeField] ItemCell m_ItemCell;

        [SerializeField] Text m_ItemName;

        [SerializeField] Button m_Close;
        [SerializeField] Button m_Goto;



        AuctionModel model { get { return ModelCenter.Instance.GetModel<AuctionModel>(); } }



        public void Init()

        {

            gameObject.SetActive(true);



            model.onFocusAuctionRefresh += OnFocusAuctionRefresh;

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;



            Display();



            m_Close.SetListener(OnClose);

            m_Goto.SetListener(Goto);

        }



        public void Unit()

        {

            model.onFocusAuctionRefresh -= OnFocusAuctionRefresh;

            NewBieCenter.Instance.guideCompletedEvent -= GuideCompletedEvent;



            m_Container.gameObject.SetActive(false);

        }



        private void GuideCompletedEvent(int id)

        {

            if (gameObject.activeInHierarchy)

            {

                StartCoroutine(Co_Display());

            }

        }



        IEnumerator Co_Display()

        {

            yield return null;

            Display();

        }



        void Display()

        {

            FocusAuctionItem item;

            if (!NewBieCenter.Instance.inGuiding

                && model.TryGetFocusAuctionPop(out item))

            {

                DisplayFocus(item);

            }

            else

            {

                m_Container.gameObject.SetActive(false);

            }

        }



        void DisplayFocus(FocusAuctionItem focusAuctionItem)

        {

            m_Container.gameObject.SetActive(true);

            ItemCellModel cellModel = new ItemCellModel(focusAuctionItem.itemId, true, (ulong)1);

            m_ItemCell.Init(cellModel);



            var itemConfig = ItemConfig.Get(focusAuctionItem.itemId);

            if (itemConfig != null)

            {

                m_ItemName.text = itemConfig.ItemName;

            }

        }



        private void OnClose()

        {

            model.RemoveFocusItemPop();

            Display();

        }



        private void OnFocusAuctionRefresh()

        {

            Display();

        }

        private void Goto()

        {

            FocusAuctionItem item;

            if (model.TryGetFocusAuctionPop(out item))

            {

                model.LocationItemByGuid(item.itemGuid);

            }

            OnClose();

        }
    }

}




 System/Auction/MyFocusAuctionBehaviour.cs.meta

 System/Auction/MyFocusBehavior.cs

File was deleted

 System/Auction/MyFocusWin.cs

@@ -46,7 +46,7 @@
            model.onAuctionRemove += ResetUpdate;

            model.auctionItemRefresh += AuctionItemUpdate;//刷新
            model.fairyAuctionRefresh += ResetUpdate;
            model.AddAuctionItemInfoUpdate += AddAuctionItemInfoUpdate;
            model.onFocusAuctionRefresh += AddAuctionItemInfoUpdate;
            model.myBiddingAuctionRefresh += ResetUpdate;
        }



@@ -58,7 +58,7 @@
            model.onAuctionRemove -= ResetUpdate;

            model.auctionItemRefresh -= AuctionItemUpdate;//刷新

            model.fairyAuctionRefresh -= ResetUpdate;

            model.AddAuctionItemInfoUpdate -= AddAuctionItemInfoUpdate;

            model.onFocusAuctionRefresh -= AddAuctionItemInfoUpdate;

            model.myBiddingAuctionRefresh -= ResetUpdate;
        }




 System/MainInterfacePanel/InGamePushContainer.cs

@@ -28,7 +28,7 @@
        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;

        [SerializeField] InSevenDayBehavior m_InSevenDayBehavior;

        [SerializeField] FBHelpPointExchageNotify m_HelpPointExchangeNotify;

        [SerializeField] MyFocusBehavior m_MyFocusBehavio;

        [SerializeField] MyFocusAuctionBehaviour m_MyFocusBehavio;

        [SerializeField] AuctionNewGetBehaviour m_AuctionNewGetBehaviour;



        WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }


 System/Skill/ScrollerController.cs

@@ -27,6 +27,8 @@


    public event Action OnRefreshCompleteEvent;



    public event Action<Vector2> onValueChange;





    public EnhancedScrollerCellView GetCellView(EnhancedScroller scroller, int dataIndex, int cellIndex)

    {

@@ -134,6 +136,8 @@
        horizontal = mScrollRect.horizontal;

        vertical = mScrollRect.vertical;



        mScrollRect.onValueChanged.AddListener(OnValueChangle);



        inited = m_Scorller.inited;

        m_Scorller.OnFirstLoadAllEvent += OnFirstLoadAllEvent;

        if (m_Scorller.OnCompLoad == null && !m_Scorller.inited)

@@ -143,6 +147,14 @@
        HideDefaultCell();

    }



    private void OnValueChangle(Vector2 delta)

    {

        if (onValueChange != null)

        {

            onValueChange(delta);

        }

    }



    private void OnFirstLoadAllEvent()

    {

        if (cacheJump != -1)