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

client_Wu Xijin

2019-04-16 e74178266e50d14b11ba40ad6d9c25bb3ae02173

 Fight/GameActor/GA_NpcClientCollect.cs

@@ -108,7 +108,15 @@

        if (_chkDistSqrt < 4)
        {
            StartCollect();
            var _model = ModelCenter.Instance.GetModel<HazyGrassModel>();
            if (_model.CanCollectClientNpc(NpcConfig.NPCID))
            {
                StartCollect();
            }
            else
            {
                _model.DisplayCollectErrorTip();
            }
        }
    }