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

client_Hale

2019-04-20 a3537e2118370592db394063070fb091f166dbad

 System/MainInterfacePanel/MainCollectBehaviour.cs

@@ -19,8 +19,7 @@
        int collectNpcId = 0;

        uint serverInstanceId = 0;



        DungeonModel dungeonModel

        {

        DungeonModel dungeonModel {

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

        }



@@ -64,18 +63,18 @@


        void DisplayNormalCollect()

        {

            var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            switch (mapId)

            var config = CollectNpcConfig.Get(collectNpcId);

            if (config == null)

            {

                case 31230:

                    m_NormalCollectIcon.SetSprite("TY_UI_8");

                    m_NormalCollectLabel.text = Language.Get("Collect_FairyFeast");

                    break;

                default:

                    m_NormalCollectIcon.SetSprite("TY_UI_6");

                    m_NormalCollectLabel.text = Language.Get("Collect_Normal");

                    break;

                m_NormalCollectIcon.SetSprite("TY_UI_6");

                m_NormalCollectLabel.text = Language.Get("Collect_Normal");

            }

            else

            {

                m_NormalCollectIcon.SetSprite(config.Icon);

                m_NormalCollectLabel.text = config.tip;

            }



            m_NormalCollectIcon.SetNativeSize();

        }