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

client_linchunjie

2018-11-10 3ea9edc13df124b2d64bc35dbb93adafb9509575

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -231,7 +231,7 @@
        }







        List<mapnpcConfig> npcConfig = new List<mapnpcConfig>();

        private bool StateDetermination()//状态判定

        {

            bool _bool = false;

@@ -244,7 +244,11 @@
                int mapID = PlayerDatas.Instance.baseData.MapID;

                if (int.TryParse(strNpc, out npcId))

                {

                    var npcConfig = Config.Instance.GetAllValues<mapnpcConfig>();

                    if (npcConfig.Count <= 0)

                    {

                        npcConfig = Config.Instance.GetAllValues<mapnpcConfig>();

                    }

                   // var npcConfig = Config.Instance.GetAllValues<mapnpcConfig>();

                    foreach (var value in npcConfig)

                    {

                        if (value.NPCID == npcId && value.MapID != mapID)