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

client_Wu Xijin

2019-04-01 cefa1f71c7192350e7a0e89ed8ae69bf08c2c009

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

 System/Auction/AuctionHouseWin.cs

@@ -65,6 +65,7 @@

        protected override void OnPreClose()
        {

            CloseChild();

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();


 System/Auction/AuctionLogicUtil.cs

@@ -181,6 +181,27 @@


            return itemModel.config.SuiteiD == 0 && itemConfig.SuiteiD != 0;

        }



        static public bool IsQueryType(int index, int itemType)

        {

            var config = AuctionIndexConfig.Get(index);

            if (config == null)

            {

                return false;

            }

            if (config.ItemType == null || config.ItemType.Length == 0)

            {

                return true;

            }

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

            {

                if (itemType == config.ItemType[i])

                {

                    return true;

                }

            }

            return false;

        }

    }

}


 System/Auction/AuctionModel.cs

@@ -38,6 +38,7 @@
        public bool isLocationQuery { get; set; }

        public string locationGuid { get; set; }

        public bool isServerPrepare { get; private set; }

        public bool isQueryFront { get; set; }



        public event Action myAuctionRefresh;

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

@@ -379,6 +380,10 @@
            {

                QueryRemaining.UpBool = package.QueryRemainlCount != 0;

                m_ServerAuctionItemGuids.InsertRange(0, fullServiceAuctionList);

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

                {

                    isQueryFront = true;

                }

            }

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

            {


 System/Auction/FullServiceAuctionWin.cs

@@ -29,6 +29,8 @@


        List<string> itemGuids = new List<string>();//全服拍品列表



        int emptyCount = 0;



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

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



@@ -299,6 +301,8 @@


        private void OnCreateGridLineCellItem(ScrollerController gridCtrl)

        {

            var firstGuid = itemGuids.Count > 0 ? itemGuids[0] : string.Empty;



            itemGuids.Clear();

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

            {

@@ -314,19 +318,44 @@
                }

            }



            var jumpIndex = -1;

            if (firstGuid != string.Empty && model.isQueryFront)

            {

                jumpIndex = itemGuids.IndexOf(firstGuid);

            }



            emptyCount = 0;

            if (jumpIndex >= itemGuids.Count - 3)

            {

                var delta = 4 - (itemGuids.Count - jumpIndex);

                for (int i = 0; i < delta; i++)

                {

                    itemGuids.Add(string.Empty);

                    emptyCount++;

                }

            }



            gridCtrl.Refresh();

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

            {

                gridCtrl.AddCell(ScrollerDataType.Header, i);

            }

            gridCtrl.Restart();



            if (jumpIndex != -1)

            {

                gridCtrl.JumpIndex(jumpIndex);

            }





            model.isQueryFront = false;

        }

        private void OnRefreshGridCellItem(ScrollerDataType type, CellView cell)

        {

            int index = cell.index;

            FullServiceAuctioncell fullServiceAuctioncell = cell.GetComponent<FullServiceAuctioncell>();

            fullServiceAuctioncell.GetFullServiceAuctionGUID(itemGuids[index], index, itemGuids.Count);

            fullServiceAuctioncell.GetFullServiceAuctionGUID(itemGuids[index], index, itemGuids.Count - emptyCount);

        }

        private void ResetServerAuctionInquiry()//重置查询

@@ -369,10 +398,6 @@
        private void PushMyBiddingItems()

        {

            var index = AuctionInquiry.Instance.GetInquiryIndex();

            if (index == 0)

            {

                return;

            }



            var myBiddingItems = model.GetMyBiddingAuctionItems();

            foreach (var guid in myBiddingItems)

@@ -384,11 +409,9 @@
                    continue;

                }



                var config = AuctionItemConfig.Get(item.itemId);

                var itemType = index / 1000;

                itemType -= 1;

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



                if (itemType == 0 || itemType == config.ItemType)

                if (index == 1000 || AuctionLogicUtil.IsQueryType(index, itemConfig.Type))

                {

                    itemGuids.Add(guid);

                }


 System/EquipGem/EquipGemModel.cs

@@ -267,6 +267,58 @@
            return m_EquipSetRedpoints.TryGetValue(level, out redpoint);

        }



        public Int2 TryGotoUseGem(int itemId)

        {

            var config = ItemConfig.Get(itemId);

            if (config == null)

            {

                return Int2.zero;

            }

            GemType gemType;

            if (!TryGetGemType(config.EffectValueA1, out gemType))

            {

                return Int2.zero;

            }

            Int2 equipPosition = Int2.zero;

            foreach (var level in cacheEquipSets)

            {

                foreach (var place in m_EquipPlaces)

                {

                    var gemTypes = m_EquipGemTypes[place];

                    if (!gemTypes.Contains(config.EffectValueA1))

                    {

                        continue;

                    }

                    for (int i = 0; i < EQUIPGEM_HOLE_COUNT; i++)

                    {

                        if (!IsEquipGemHoleOpen(level, place, i))

                        {

                            continue;

                        }

                        if (equipPosition.Equals(Int2.zero))

                        {

                            equipPosition.x = level;

                            equipPosition.y = place;

                        }

                        var equipGem = 0;

                        if (TryGetEquipGem(level, place, i, out equipGem))

                        {

                            var compareConfig = ItemConfig.Get(equipGem);

                            if(config.EffectValueB1 > compareConfig.EffectValueB1)

                            {

                                return new Int2(level, place);

                            }

                        }

                        else

                        {

                            return new Int2(level, place);

                        }

                    }

                }

            }

            return equipPosition;

        }



        public bool IsEquipGemHoleOpen(int level, int place, int hole)

        {

            var equipPosition = new Int2(level, place);


 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -727,9 +727,16 @@
            if (item == null)

            {

                return;

            }
            }

            var equipGemModel = ModelCenter.Instance.GetModel<EquipGemModel>();
            equipGemModel.jumpEquipPosition = new Int2(item.config.LV, item.config.EquipPlace);
            if (ItemLogicUtility.Instance.IsEquip(item.itemId))

            {

                equipGemModel.jumpEquipPosition = new Int2(item.config.LV, item.config.EquipPlace);

            }
            else

            {

                equipGemModel.jumpEquipPosition = equipGemModel.TryGotoUseGem(item.itemId);

            }

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc3);
        }