1855 还原仙器替换界面点击不显示装备tips

Client_PangDeRong

2018-09-05 de5ca03220342e64a81ff2976a0df983b660fe91

1855 还原仙器替换界面点击不显示装备tips

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -329,7 +329,6 @@


            FuncConfigConfig randomRuneConfig = Config.Instance.Get<FuncConfigConfig>("RandomRuneIDList");

            randomRuneIds = ConfigParse.GetMultipleStr<int>(randomRuneConfig.Numerical1);

            WindowCenter.Instance.windowBeforeCloseEvent += CloseWinEvent;

        }



        public void OnBeforePlayerDataInitialize()

@@ -355,13 +354,6 @@


        public ItemAttrData curAttrData { get; private set; }

        public ItemAttrData compareAttrData { get; private set; }





        private void CloseWinEvent(Window obj)

        {

            curAttrData = null;

            compareAttrData = null;

        }



        /// <summary>

        ///从背包类型中得到物品展示


 System/KnapSack/New/CommonItemBaisc.cs

@@ -197,13 +197,6 @@
                    bool isOverdue = modelInterface.IsOverdue(guid, itemId, useDataDic);

                    if (!isOverdue)

                    {

                        int equipScore1 = 0;

                        if (tipsModel.compareAttrData != null)

                        {

                            equipScore1 = tipsModel.compareAttrData.score;

                        }

                        else

                        {

                            ItemModel putOnModel = playerPack.GetItemModelByIndex(PackType.rptEquip, itemConfig.EquipPlace);

                            if (itemConfig.EquipPlace == (int)RoleEquipType.retFairyCan)

                            {

@@ -223,12 +216,11 @@
                                    putOnModel = fairyModel2;

                                }

                            }

                        int equipScore1 = 0;

                            if (putOnModel != null)

                            {

                                equipScore1 = putOnModel.equipScore;

                            }

                        }

                     
                        int playerJob = PlayerDatas.Instance.baseData.Job;

                        if (playerJob == Math.Floor((double)itemConfig.JobLimit / 100) || itemConfig.JobLimit == 0)

                        {


 System/KnapSack/New/FairyWearWin.cs

@@ -90,16 +90,16 @@
            {

                _itemCell01.gameObject.SetActive(true);

                _itemCell01.Init(_itemModel01, false);

                _itemCell01.cellBtn.RemoveAllListeners();

                _itemCell01.cellBtn.AddListener(()=>

                {

                    if (PackSendQuestMgr.Instance.sendItemModel != null)

                    {

                        itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel,true);

                        itemTipsModel.SetCompareAttrData(_itemModel01);

                        itemTipsModel.ShowUICtrl();

                    }

                });

                //_itemCell01.cellBtn.RemoveAllListeners();

                //_itemCell01.cellBtn.AddListener(()=>

                //{

                //    if (PackSendQuestMgr.Instance.sendItemModel != null)

                //    {

                //        itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel,true);

                //        itemTipsModel.SetCompareAttrData(_itemModel01);

                //        itemTipsModel.ShowUICtrl();

                //    }

                //});

                //pdr ToDo  

                _wear01Text.text = Language.Get("BagWin_BtnText_1");

            }

@@ -116,16 +116,16 @@
                //pdr ToDo



                _wear02Text.text = Language.Get("BagWin_BtnText_1");

                _itemCell02.cellBtn.RemoveAllListeners();

                _itemCell02.cellBtn.AddListener(()=>

                {

                    if (PackSendQuestMgr.Instance.sendItemModel != null)

                    {

                        itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel, true);

                        itemTipsModel.SetCompareAttrData(_itemModel02);

                        itemTipsModel.ShowUICtrl();

                    }

                });

                //_itemCell02.cellBtn.RemoveAllListeners();

                //_itemCell02.cellBtn.AddListener(()=>

                //{

                //    if (PackSendQuestMgr.Instance.sendItemModel != null)

                //    {

                //        itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel, true);

                //        itemTipsModel.SetCompareAttrData(_itemModel02);

                //        itemTipsModel.ShowUICtrl();

                //    }

                //});

             

            }

            else