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

client_Wu Xijin

2019-06-10 698cc3f09dd9cb9b0ac22091c91fc547751a5e5e

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

 System/HazyRegion/HazyGrassDungeonWin.cs

@@ -22,6 +22,7 @@
        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }

        HazyGrassModel hazyGrassModel { get { return ModelCenter.Instance.GetModel<HazyGrassModel>(); } }

        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        #region Built-in

        protected override void BindController()

        {

@@ -36,6 +37,12 @@
            Display();



            hazyGrassModel.onMapNpcCountRefresh += OnMapNpcCountRefresh;



            if (PlayerDatas.Instance.baseData.MapID == HazyGrassModel.FAIRY_CLIENTDATAMAP

                    || PlayerDatas.Instance.baseData.MapID == HazyGrassModel.FAIRY_DATAMAP)

            {

                packModel.refreshItemCountEvent += RefreshItemCountEvent;

            }

        }



        protected override void OnAfterOpen()

@@ -45,6 +52,34 @@
        protected override void OnPreClose()

        {

            hazyGrassModel.onMapNpcCountRefresh -= OnMapNpcCountRefresh;

            packModel.refreshItemCountEvent -= RefreshItemCountEvent;

        }



        private void RefreshItemCountEvent(PackType packType, int arg2, int itemId)

        {

            if (packType == PackType.Item)

            {

                var mapId = 0;

                if (ClientDungeonStageUtility.isClientDungeon)

                {

                    var incidentId = hazyRegionModel.GetIncidentId(ClientDungeonStageUtility.dungeonInfo.mapId, ClientDungeonStageUtility.dungeonInfo.lineId);

                    mapId = hazyGrassModel.GetGrassMapId(incidentId);

                }

                else

                {

                    mapId = PlayerDatas.Instance.baseData.MapID;

                }

                var npcInfos = hazyGrassModel.GetGrassNpcInfos(mapId);

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

                {

                    var _itemId = hazyGrassModel.GetGrassNpcItemId(npcInfos[i]);

                    if (_itemId == itemId)

                    {

                        DisplayGrassCount();

                        return;

                    }

                }

            }

        }



        protected override void OnAfterClose()