Merge branch 'master' into JadeDynastyTower

client_Wu Xijin

2019-01-21 6a5efece9e4ef5247047b4dc4c6c46dc461f4b6a

 Core/ResModule/SceneLoader.cs

@@ -11,7 +11,7 @@
        if (AssetSource.sceneFromEditor)
        {
#if UNITY_EDITOR
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Scene/", folder, "/", name, ".png");
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Scene/", folder, "/", name, ".jpg");
            texture2D = UnityEditor.AssetDatabase.LoadAssetAtPath<Texture2D>(path);
#endif
        }