Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/KnapSack/New/BagWin.cs

@@ -63,12 +63,12 @@
        protected override void OnPreOpen() {



            KnapsackTimeCDMgr.Instance.RefreshItemOverdueAct += RefreshRemainTime;

            playerPack.RefreshBagEvent += RefreshBagInfo;

            playerPack.lookEquipEvent += LookEquip;

            playerPack.RefreshItemCountAct += OnAddItemCell;

            playerPack.RefreshPackAct += RefreshPackModel;

            playerPack.GridRefreshEvent += OnPackCanUseGrid;

        }



        protected override void OnAfterOpen() {



            this.transform.SetAsLastSibling();

@@ -91,6 +91,7 @@
            playerPack.RefreshPackAct -= RefreshPackModel;

            playerPack.lookEquipEvent -= LookEquip;

            playerPack.GridRefreshEvent -= OnPackCanUseGrid;

            playerPack.RefreshBagEvent -= RefreshBagInfo;

        }



        protected override void OnAfterClose() {

@@ -127,6 +128,12 @@
            }

        }





        private void RefreshBagInfo()

        {

            _gridlineCtrl.m_Scorller.RefreshActiveCellViews();

        }



        public void OnRefrenshUIModel() {

            packModel = playerPack.GetSinglePackModel(PackType.rptItem);

            OnCreateGridLineCell(_gridlineCtrl);