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

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 Core/ResModule/MaterialLoader.cs

@@ -16,7 +16,7 @@
        Material _controller = AssetBundleUtility.Instance.Sync_LoadAsset(_assetInfo) as Material;

        if (_controller == null) {
            DesignDebug.LogErrorFormat("MaterialLoader.Load() => 加载不到资源: {0}.", _assetName);
            DebugEx.LogErrorFormat("MaterialLoader.Load() => 加载不到资源: {0}.", _assetName);
        }

        return _controller;