Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-03-19 e836e2bbe5023c4432b5d883f8f9b039cf629bfd

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/MapEditor/Behavior/Bhv_TransferPoint.cs

@@ -7,6 +7,10 @@
    {
        [HideInInspector]
        public int effectID = -1;
        public string stateNameFront = "Fly_500";
        public float flyTimeFront = 2;
        public string stateNameBack = "Fly_500";
        public float flyTimeBack = 2;

#if UNITY_EDITOR

@@ -16,6 +20,10 @@
        public void Save(BinaryWriter bw)
        {
            bw.Write(effectID);
            bw.Write(stateNameFront);
            bw.Write(flyTimeFront);
            bw.Write(stateNameBack);
            bw.Write(flyTimeBack);
            bw.Write((float)System.Math.Round(transform.position.x, 2));
            bw.Write((float)System.Math.Round(transform.position.y, 2));
            bw.Write((float)System.Math.Round(transform.position.z, 2));
@@ -25,6 +33,10 @@
        public void Load(BinaryReader br)
        {
            effectID = br.ReadInt32();
            stateNameFront = br.ReadString();
            flyTimeFront = br.ReadSingle();
            stateNameBack = br.ReadString();
            flyTimeBack = br.ReadSingle();
            float _x = br.ReadSingle();
            float _y = br.ReadSingle();
            float _z = br.ReadSingle();

 Core/MapEditor/Behavior/Bhv_Trasfer.cs

@@ -116,11 +116,35 @@
                            pointList.RemoveAt(i);
                            continue;
                        }
                        EditorGUILayout.BeginHorizontal(guiSkin.box, GUILayout.Height(22));
                        EditorGUILayout.LabelField("[" + (i + 1) + "]", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(40));
                        EditorGUILayout.LabelField("特效ID", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(40));
                        EditorGUILayout.BeginVertical(guiSkin.box);
                        EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
                        EditorGUILayout.LabelField("[" + (i + 1) + "]", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
                        EditorGUILayout.LabelField("特效", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
                        pointList[i].effectID = EditorGUILayout.IntField(pointList[i].effectID, guiSkin.textField, GUILayout.Height(20));
                        if (GUILayout.Button("定高", guiSkin.button, GUILayout.Width(60), GUILayout.Height(20)))
                        EditorGUILayout.EndHorizontal();

                        if (i - 1 >= 0)
                        {
                            EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
                            EditorGUILayout.LabelField("到上一个节点的动作", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(120));
                            pointList[i].stateNameFront = EditorGUILayout.TextField(pointList[i].stateNameFront, guiSkin.textField, GUILayout.Height(20));
                            EditorGUILayout.LabelField("时间", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
                            pointList[i].flyTimeFront = EditorGUILayout.FloatField(pointList[i].flyTimeFront, guiSkin.textField, GUILayout.Height(20));
                            EditorGUILayout.EndHorizontal();
                        }

                        if (i + 1 < pointList.Count)
                        {
                            EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
                            EditorGUILayout.LabelField("到下一个节点的动作", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(120));
                            pointList[i].stateNameBack = EditorGUILayout.TextField(pointList[i].stateNameBack, guiSkin.textField, GUILayout.Height(20));
                            EditorGUILayout.LabelField("时间", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
                            pointList[i].flyTimeBack = EditorGUILayout.FloatField(pointList[i].flyTimeBack, guiSkin.textField, GUILayout.Height(20));
                            EditorGUILayout.EndHorizontal();
                        }

                        EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
                        if (GUILayout.Button("定高", guiSkin.button, GUILayout.Height(20)))
                        {
                            Vector3 _pos = pointList[i].transform.position;
                            _pos.y = 0;
@@ -132,7 +156,7 @@
                                pointList[i].transform.position = _hit.point;
                            }
                        }
                        if (GUILayout.Button("查找", guiSkin.button, GUILayout.Width(60), GUILayout.Height(20)))
                        if (GUILayout.Button("查找", guiSkin.button, GUILayout.Height(20)))
                        {
                            Selection.activeGameObject = pointList[i].gameObject;
                            if (Selection.activeGameObject)
@@ -140,12 +164,13 @@
                                SceneView.lastActiveSceneView.LookAt(Selection.activeGameObject.transform.position);
                            }
                        }
                        if (GUILayout.Button("删除", guiSkin.button, GUILayout.Width(60), GUILayout.Height(20)))
                        if (GUILayout.Button("删除", guiSkin.button, GUILayout.Height(20)))
                        {
                            DestroyImmediate(pointList[i].gameObject);
                            pointList.RemoveAt(i);
                        }
                        EditorGUILayout.EndHorizontal();
                        EditorGUILayout.EndVertical();
                    }
                }
                EditorGUILayout.EndVertical();

 Core/MapEditor/Data/Transfer/MapTransferPoint.cs

@@ -7,12 +7,20 @@
    public class MapTransferPoint
    {
        public int effectID;
        public string stateNameFront;
        public float flyTimeFront;
        public string stateNameBack;
        public float flyTimeBack;
        public float radius;
        public Vector3 position;

        public void Load(BinaryReader br)
        {
            effectID = br.ReadInt32();
            stateNameFront = br.ReadString();
            flyTimeFront = br.ReadSingle();
            stateNameBack = br.ReadString();
            flyTimeBack = br.ReadSingle();
            float _x = br.ReadSingle();
            float _y = br.ReadSingle();
            float _z = br.ReadSingle();

 System/Auction/AuctionInquiry.cs

@@ -26,13 +26,13 @@
    {

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

        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
        public int GetSendNumber()

        public int GetSendNumber()//获取当前拍卖列表的索引类型

        {

            var sendNumber = 0;

            var index = auctionHelpModel.SelectedGenreNow;

            if (!auctionHelpModel.FullServiceAuctionDic.ContainsKey(index))

            {

                DebugEx.LogError("---没有找到该索引下标的数据");

                //DebugEx.LogError("---没有找到该索引下标的数据");

                return sendNumber;

            }

            var fullServiceAuction = auctionHelpModel.FullServiceAuctionDic[index];

@@ -81,6 +81,44 @@
            queryAuctionItem.QueryCount = queryCount;

            SendQueryAuctionItem(queryAuctionItem);

        }
        public void SendLocationQuery(string itemGUID)//定位查询

        {

            if (auctionHelpModel.SelectedGenreNow != 0)

            {

                auctionHelpModel.SelectedGenreNow = 0;

            }

            int indexId = GetSendNumber();

            var auctionIndex = AuctionIndexConfig.Get(indexId);

            if (auctionIndex == null)

            {

                DebugEx.LogError("拍卖索引表没有查到对应的ID" + indexId);

                return;

            }

            QueryAuctionItem queryAuctionItem = new QueryAuctionItem();

            queryAuctionItem.FromItemGUID = itemGUID;

            queryAuctionItem.Job = auctionIndex.Job;

            queryAuctionItem.ItemTypeList = new List<uint>();

            if (auctionIndex.ItemType != null && auctionIndex.ItemType.Length > 0)

            {

                for (int i = 0; i < auctionIndex.ItemType.Length; i++)

                {

                    queryAuctionItem.ItemTypeList.Add((uint)auctionIndex.ItemType[i]);

                }

            }

            queryAuctionItem.ClassLV = auctionIndex.Order;

            queryAuctionItem.SpecItemIDList = new List<uint>();

            if (auctionIndex.SpecItemID != null && auctionIndex.SpecItemID.Length > 0)

            {

                for (int i = 0; i < auctionIndex.SpecItemID.Length; i++)

                {

                    queryAuctionItem.SpecItemIDList.Add((uint)auctionIndex.SpecItemID[i]);

                }

            }

            queryAuctionItem.QueryDir = 3;//定位查询

            queryAuctionItem.QueryCount = 10;

            SendQueryAuctionItem(queryAuctionItem);

        }

        private void SendQueryAuctionItem(QueryAuctionItem queryAuctionItem)//拍卖行查询拍卖中的物品

        {

            CB510_tagCGQueryAuctionItem cb510 = new CB510_tagCGQueryAuctionItem();


 System/Auction/AuctionInquiryModel.cs

@@ -68,7 +68,13 @@
        public QueryRemainingClass QueryRemaining = new QueryRemainingClass();



        private const int Redpointkey1 = 217;

        public Redpoint redPointStre1 = new Redpoint(2, Redpointkey1);//集市红点

        public Redpoint redPointStre1 = new Redpoint(2, Redpointkey1);//拍卖行红点

        private bool locationQuery = false;

        public bool LocationQuery

        {

            get { return locationQuery; }

            set { locationQuery = value; }

        }

        public override void Init()

        {



@@ -76,6 +82,7 @@


        public void OnBeforePlayerDataInitialize()

        {

            LocationQuery = false;

            PlayerAuctionItemInfoDic.Clear();

            FullServiceAuctionList.Clear();

            FamilyAuctionItemDic.Clear();

@@ -138,7 +145,16 @@
            }

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

            {

                FullServiceAuctionList.InsertRange(FullServiceAuctionList.Count - 1, fullServiceAuctionList);

                if (FullServiceAuctionList.Count == 0)

                {

                    FullServiceAuctionList.InsertRange(0, fullServiceAuctionList);

                }

                else

                {

                    FullServiceAuctionList.InsertRange(FullServiceAuctionList.Count - 1, fullServiceAuctionList);

                }

                LocationQuery = true;

                WindowCenter.Instance.Open<AuctionHouseWin>(true,0);//定位查询

            }



            if (FullServiceAuctionUpdate != null)


 System/Auction/FamilyAuctionWin.cs

@@ -39,7 +39,7 @@
        {
            model.FamilyAuctionItemUpdate += FamilyAuctionReset;

            model.ClearFamilyAuctionUpdate += FamilyAuctionReset;
            model.RefreshAuctionItemUpdate += RefreshAuctionItemUpdate;           
            model.RefreshAuctionItemUpdate += RefreshAuctionItemUpdate;

            model.BiddingItemInfoUpdate += RefreshAuctionItemUpdate;
        }

@@ -49,10 +49,10 @@
            model.ClearFamilyAuctionUpdate -= FamilyAuctionReset;

            model.BiddingItemInfoUpdate -= RefreshAuctionItemUpdate;

            model.RefreshAuctionItemUpdate -= RefreshAuctionItemUpdate;

           


        }



       




        protected override void OnAfterClose()
        {
@@ -67,7 +67,7 @@
        private void RefreshAuctionItemUpdate()

        {

            m_ScrollerControllerItem.m_Scorller.RefreshActiveCellViews();//刷新可见

        }     
        }

        private void OnCreateGridCellItem(ScrollerController gridCtrl)

        {

            gridCtrl.Refresh();

@@ -114,9 +114,9 @@
            {

                return -havex1.CompareTo(havey1);

            }

            bool havex2 = IsAttention(x.ItemID);

            bool havey2 = IsAttention(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否关注

            bool havex2 = IsNeedEquip(x.ItemID);

            bool havey2 = IsNeedEquip(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否需要

            {

                return -havex2.CompareTo(havey2);

            }

@@ -136,7 +136,7 @@
            if (model.BiddingItemInfoDic.ContainsKey(GUID))

            {

                var biddingItemInfo = model.BiddingItemInfoDic[GUID];

                isBool=biddingItemInfo.BidderID == playerId;

                isBool = biddingItemInfo.BidderID == playerId;

            }

            return isBool;

        }

@@ -150,10 +150,15 @@
            }

            return isBool;

        }
        private bool IsAttention(int itemId)

        private bool IsNeedEquip(int itemId)

        {

            bool isBool = false;

            if (model.AttentionAuctionItemIDdic.ContainsKey(itemId))

            var itemConfig = ItemConfig.Get(itemId);

            if (itemConfig == null)

            {

                return false;

            }

            if (!auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace))

            {

                isBool = true;

            }

@@ -169,7 +174,7 @@
            }

            var timeNow = TimeUtility.ServerNow;

            TimeSpan timeSpan = timeNow - auctionItemClass.Time;

            scends= (int)timeSpan.TotalSeconds;

            scends = (int)timeSpan.TotalSeconds;

            return scends;

        }
    }

 System/Auction/FamilyAuctioncell.cs

@@ -63,7 +63,8 @@
                return;

            }

            AuctionItem = auctionItem;

            if (model.AttentionAuctionItemIDdic.ContainsKey(familyAuctionItem.ItemID))//是否关注

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace);

            if (!equipNeedBool)//是否需要

            {

                m_NeedImage.SetActive(true);

            }


 System/Auction/FullServiceAuctionWin.cs

@@ -256,16 +256,22 @@
        private void OnCreateGridLineCellItem(ScrollerController gridCtrl)

        {

            ListSort();

            for (int i = 0; i < model.FullServiceAuctionList.Count; i++)

            if (!model.LocationQuery)

            {

                var FullServiceAuction = model.FullServiceAuctionList[i];

                var index = FullServiceAuctionListSort.FindIndex((x) => { return x.ItemGUID == FullServiceAuction.ItemGUID; });

                if (index == -1)

                for (int i = 0; i < model.FullServiceAuctionList.Count; i++)

                {

                    FullServiceAuctionListSort.Add(FullServiceAuction);

                    var FullServiceAuction = model.FullServiceAuctionList[i];

                    var index = FullServiceAuctionListSort.FindIndex((x) => { return x.ItemGUID == FullServiceAuction.ItemGUID; });

                    if (index == -1)

                    {

                        FullServiceAuctionListSort.Add(FullServiceAuction);

                    }

                }

            }

        
            else

            {

                model.LocationQuery = false;

            }                   
            gridCtrl.Refresh();

            for (int i = 0; i <FullServiceAuctionListSort.Count; i++)

            {


 System/Auction/FullServiceAuctioncell.cs

@@ -85,6 +85,11 @@
                return;

            }

            AuctionItem = auctionItem;

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV,itemConfig.EquipPlace);

            if (!equipNeedBool)

            {

                m_NeedImage.SetActive(true);

            }

            if (model.BiddingItemInfoDic.ContainsKey(fullServiceAuction.ItemGUID))//参与了竞价的物品

            {

                var biddingItemInfo = model.BiddingItemInfoDic[fullServiceAuction.ItemGUID];


 System/Auction/MyFocusCell.cs

@@ -74,7 +74,8 @@
                return;

            }

            AuctionItem = auctionItem;

            if (model.AttentionAuctionItemIDdic.ContainsKey(myAuction.ItemID))//是否关注

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace);

            if (!equipNeedBool)//是否需要

            {

                m_NeedImage.SetActive(true);

            }


 System/Auction/MyFocusWin.cs

@@ -121,9 +121,9 @@
            {

                return -havex1.CompareTo(havey1);

            }

            bool havex2 = IsAttention(x.ItemID);

            bool havey2 = IsAttention(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否关注

            bool havex2 = IsNeedEquip(x.ItemID);

            bool havey2 = IsNeedEquip(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否需要

            {

                return -havex2.CompareTo(havey2);

            }

@@ -157,10 +157,15 @@
            }

            return isBool;

        }
        private bool IsAttention(int itemId)

        private bool IsNeedEquip(int itemId)

        {

            bool isBool = false;

            if (model.AttentionAuctionItemIDdic.ContainsKey(itemId))

            var itemConfig = ItemConfig.Get(itemId);

            if (itemConfig == null)

            {

                return false;

            }

            if (!auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace))

            {

                isBool = true;

            }


 System/Auction/TransactionRecordWin.cs

@@ -118,7 +118,7 @@


            GameObject SuccessfulBiddingObj = cell.transform.Find("SuccessfulBiddingObj").gameObject;//竞拍成功(竞拍成功)

            RichText SuccessfulBiddingText = cell.transform.Find("SuccessfulBiddingObj/SuccessfulBiddingText").GetComponent<RichText>();

            Text JadeMoney= cell.transform.Find("SuccessfulBiddingObj/JadeMoney").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>();

@@ -132,7 +132,7 @@
                    {

                        transactionStatusText.text = Language.Get("PMH_11");

                    }

                    else if (AuctionType==1)

                    else if (AuctionType == 1)

                    {

                        transactionStatusText.text = Language.Get("PMH_12");

                    }

@@ -161,7 +161,7 @@
                    AuctionFailedObj.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    transactionStatusText.gameObject.SetActive(false);

                    JadeMoney_1.text= auctionRecord.BidderPrice.ToString();

                    JadeMoney_1.text = auctionRecord.BidderPrice.ToString();

                    break;

            }



@@ -226,6 +226,15 @@
                    AuctionRecordList.Add(value);

                }

            }

            AuctionRecordList.Sort(Compare);

        }
        int Compare(AuctionItemClass x, AuctionItemClass y)

        {

            if (x.Time.CompareTo(y.Time) != 0)//根据时间排序

            {

                return -x.Time.CompareTo(y.Time);

            }

            return 1;

        }
    }


 System/Message/RichNormalEvent.cs

@@ -113,6 +113,7 @@
                    if (href.mSplits.ContainsKey("auctionbidding"))

                    {

                        var guid = href.mSplits["auctionbidding"];

                        AuctionInquiry.Instance.SendLocationQuery(guid);//定位查询

                        //--竞价

                    }

                }