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

client_Hale

2019-04-03 734966ee22df14a5b405ecb450ca6c7ec2c9841b

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

 System/Auction/AuctionModel.cs

@@ -342,13 +342,13 @@
            }



            var index = config.TypeId;

            if (config.ChooseItem1 != null && config.ChooseItem1.Length > 0)

            if (config.ChooseItem1 != null && childClassifyIndex.x < config.ChooseItem1.Length)

            {

                index += childClassifyIndex.x;

                index += config.ChooseItem1[childClassifyIndex.x];

            }

            if (config.ChooseItem2 != null && config.ChooseItem2.Length > 0)

            if (config.ChooseItem2 != null && childClassifyIndex.y < config.ChooseItem2.Length)

            {

                index += childClassifyIndex.y;

                index += config.ChooseItem2[childClassifyIndex.y];

            }

            return index;

        }


 System/Auction/AuctionShelfWin.cs

@@ -94,6 +94,11 @@
            var cellModel = new ItemCellModel(auctionHelpModel.ItemModel.itemId, true, (ulong)1);

            m_ItemCell.Init(cellModel);

            m_ItemName.text = auctionHelpModel.ItemModel.config.ItemName;

            m_ItemCell.button.SetListener(() =>

            {

                var itemData = new ItemAttrData(config.ItemID, true, 1);

                ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemData);

            });



            var isOverdue = ItemLogicUtility.Instance.IsOverdue(auctionHelpModel.ItemModel.guid);




 System/Dungeon/DungeonLiquidCell.cs

@@ -206,7 +206,7 @@


    private void OnItemClick(ItemConfig _itemCfg)

    {

        ItemAttrData itemAttrData = new ItemAttrData(_itemCfg.ID);

        ItemAttrData itemAttrData = new ItemAttrData(_itemCfg.ID, true);

        ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData);

    }




 System/FairyAu/FairyLeagueRankCell.cs

@@ -95,7 +95,7 @@
                    m_ChampionAward.Init(_Award.id, Mathf.Min(1, _Award.count));

                    m_ChampionAwardBtn.onClick.AddListener(() =>

                    {

                        ItemAttrData _itemData = new ItemAttrData(_Award.id, false, (ulong)_Award.count);

                        ItemAttrData _itemData = new ItemAttrData(_Award.id, true, (ulong)_Award.count);

                        ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemData);

                    });

                }


 System/FairyAu/KingFairyChestWin.cs

@@ -55,7 +55,7 @@
        protected override void OnActived()

        {

            base.OnActived();

            ItemAttrData _itemData = new ItemAttrData(model.viewChestItem.id, false,

            ItemAttrData _itemData = new ItemAttrData(model.viewChestItem.id, true,

                (ulong)model.viewChestItem.count);

            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemData, false);

            m_ChestDetailBehaviour.Display();

@@ -68,7 +68,7 @@
                {

                    if (index < m_EquipDetails.Length)

                    {

                        ItemAttrData attr = new ItemAttrData(key, false, (ulong)dict[key]);

                        ItemAttrData attr = new ItemAttrData(key, true, (ulong)dict[key]);

                        m_EquipDetails[index].InitModel(attr);

                        m_EquipDetails[index].gameObject.SetActive(true);

                        index++;


 System/FairyAu/KingTempleWin.cs

@@ -227,14 +227,14 @@


        private void OnPrivilegeItem()

        {

            ItemAttrData attrData = new ItemAttrData(model.privilegeItemId);

            ItemAttrData attrData = new ItemAttrData(model.privilegeItemId, true);

            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

        }



        private void OnSalaryItem(int index)

        {

            var _itemArray = model.salaryAwardItems[index];

            ItemAttrData attrData = new ItemAttrData(_itemArray[0], false, (ulong)_itemArray[1]);

            ItemAttrData attrData = new ItemAttrData(_itemArray[0], true, (ulong)_itemArray[1]);

            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

        }

    }


 System/GatheringSoul/GatherSoulHoleBehaviour.cs

@@ -98,7 +98,7 @@
                if (model.TryGetItem(hole, out item))

                {

                    var itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>();

                    var data = new ItemAttrData(item.id);

                    var data = new ItemAttrData(item.id, true);

                    data.SetGatherSoul(item.level, hole);

                    GatherSoulComposeModel.Compose compose;

                    bool requireCompose = composeModel.ExistInComposeMat(item.id, out compose);


 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -214,7 +214,7 @@
                GatherSoulItem item;

                if (model.TryGetItem(displayItem.packType, displayItem.index, out item))

                {

                    var data = new ItemAttrData(item.id);

                    var data = new ItemAttrData(item.id, true);

                    data.SetGatherSoul(item.level, -1, PackType.GatherSoul, displayItem.index);

                    if (item.itemType != GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE)

                    {

@@ -261,7 +261,7 @@
            {

                if (displayItem.itemId != 0)

                {

                    var data = new ItemAttrData(displayItem.itemId);

                    var data = new ItemAttrData(displayItem.itemId, true);

                    data.SetGatherSoul(displayItem.level, -1);

                    itemTipsModel.SetItemTipsModel(data);

                }


 System/Message/RichTableEvent.cs

@@ -518,7 +518,7 @@
            }

        }



        ItemAttrData attrData = new ItemAttrData(itemId, false, (ulong)itemCount, -1,  false, PackType.Deleted,

        ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)itemCount, -1,  false, PackType.Deleted,

            "", userdatadic);

        attrData.SetGemModel(stone);

        attrData.SetStrengthData(strengthenLv, GetStrengthenType(itemId));


 System/OpenServerActivity/ImpactRankWin.cs

@@ -300,12 +300,12 @@
                if (_itemList != null && i < _itemList.Count)

                {

                    var _item = _itemList[i];

                    ItemCellModel _ItemData = new ItemCellModel(_item.id, false, (ulong)_item.count);

                    ItemCellModel _ItemData = new ItemCellModel(_item.id, true, (ulong)_item.count);

                    _cell.items[i].SetItemRare(_ItemData, 5);

                    _cell.items[i].button.RemoveAllListeners();

                    _cell.items[i].button.AddListener(() =>

                    {

                        ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, false, (ulong)_item.count);

                        ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, true, (ulong)_item.count);

                        ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData);

                    });

                }


 System/Vip/VipInvest/VipInvestWin.cs

@@ -185,12 +185,12 @@
                {

                    itemBaisc.gameObject.SetActive(true);

                    InvestReward reward = rewardlist[i];

                    ItemCellModel cellModel = new ItemCellModel(reward.id, false, reward.count);

                    ItemCellModel cellModel = new ItemCellModel(reward.id, true, reward.count);

                    itemBaisc.Init(cellModel);

                    itemBaisc.button.RemoveAllListeners();

                    itemBaisc.button.AddListener(() =>

                    {

                        ItemAttrData attrData = new ItemAttrData(reward.id, false, reward.count);

                        ItemAttrData attrData = new ItemAttrData(reward.id, true, reward.count);

                        tipsModel.SetItemTipsModel(attrData);

                    });

                }


 System/Vip/VipWin.cs

@@ -388,7 +388,7 @@
                            }

                            else

                            {

                                ItemAttrData attrData = new ItemAttrData(award.id, false, (ulong)award.count);

                                ItemAttrData attrData = new ItemAttrData(award.id, true, (ulong)award.count);

                                itemTipsModel.SetItemTipsModel(attrData);

                            }

                        });


 System/Welfare/LevelGiftWin.cs

@@ -84,12 +84,12 @@
                    _cell.items[i].gameObject.SetActive(true);

                    _cell.gotImages[i].gameObject.SetActive(_isGet);

                    var _item = _items[i];

                    ItemCellModel _ItemData = new ItemCellModel(_item.id, false, (ulong)_item.count);

                    ItemCellModel _ItemData = new ItemCellModel(_item.id, true, (ulong)_item.count);

                    _cell.items[i].Init(_ItemData);

                    _cell.items[i].button.RemoveAllListeners();

                    _cell.items[i].button.AddListener(() =>

                    {

                        ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, false, (ulong)_item.count);

                        ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, true, (ulong)_item.count);

                        ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData);

                    });

                }

@@ -100,12 +100,12 @@
            }



            var _vipAward = model.m_VipItemDict[_cell.index];

            ItemCellModel _vipDate = new ItemCellModel(_vipAward.item.id, false, (ulong)_vipAward.item.count);

            ItemCellModel _vipDate = new ItemCellModel(_vipAward.item.id, true, (ulong)_vipAward.item.count);

            _cell.vipItem.Init(_vipDate);

            _cell.vipItem.button.RemoveAllListeners();

            _cell.vipItem.button.AddListener(() =>

            {

                ItemAttrData _itemPropertyData = new ItemAttrData(_vipAward.item.id, false, (ulong)_vipAward.item.count);

                ItemAttrData _itemPropertyData = new ItemAttrData(_vipAward.item.id, true, (ulong)_vipAward.item.count);

                ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData);

            });

            _cell.vipGotImage.gameObject.SetActive(_vipGot);


 System/Welfare/SignInItemBehaviour.cs

@@ -119,7 +119,7 @@
                itemId = config.ItemID[0];

                itemCount = config.OrdinaryNum[0];

            }

            ItemAttrData attrData = new ItemAttrData(itemId, false, (ulong)itemCount);

            ItemAttrData attrData = new ItemAttrData(itemId, true, (ulong)itemCount);

            ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

        }

    }