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

client_linchunjie

2018-11-16 f781775e83f2df9735bd5c832e653bbd683df50b

 System/BetterItemGet/BetterEquipGetModel.cs

@@ -71,6 +71,7 @@
                bool isCoolEnd = coolData == null || coolData.GetRemainTime() <= 0 ? true : false;

                if(isCoolEnd)

                {

                    DebugEx.Log("UpdateCoolTime:" + _equip.itemId);

                    PackSendQuestMgr.Instance.SendPutOnQuest(ItemWinBtnType.putOn,guid);

                    ReportConfirmBetterEquip(guid);

                }

@@ -167,11 +168,6 @@
                        {

                            showEquipRefreshEvent();

                        }



                        if(CheckIsAutoEquip(betterModel))

                        {

                            KnapsackTimeCDMgr.Instance.Register(betterModel.itemInfo.ItemGUID, betterModel.itemId, autoEquipCoolTime);

                        }

                    }

                }

                else

@@ -211,10 +207,6 @@
                showEquipRefreshEvent();

            }

            var betterModel = playerPack.GetItemModelByGUID(_guid);

            if (CheckIsAutoEquip(betterModel))

            {

                KnapsackTimeCDMgr.Instance.Register(betterModel.itemInfo.ItemGUID, betterModel.itemId, autoEquipCoolTime);

            }

        }



        private void OnPackageRefresh(PackType _packType)

@@ -223,7 +215,6 @@
            {

                return;

            }



            var keys = new List<string>(betterEquipModels.Keys);

            for (int i = keys.Count - 1; i >= 0; i--)

            {

@@ -280,7 +271,11 @@
            }

            else if (_packType == PackType.rptItem)

            {

                OnPackageRefresh(_packType);

                var itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,_index);

                if(itemModel == null)

                {

                    OnPackageRefresh(_packType);

                }

            }

        }