Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-20 a8c896286840cc372e48765e7039543b1c4e7c64

 Core/GameEngine/Login/Launch.cs

@@ -284,7 +284,13 @@
            }

        }

#endif



#if UNITY_EDITOR

            if (!AssetSource.allFromEditor)

            {

                FileExtersion.DirectoryCopy(ResourcesPath.CONFIG_FODLER, ResourcesPath.Instance.StreamingAssetPath + "config");

                FileExtersion.DirectoryCopy(ResourcesPath.ResourcesOutPath + "BuiltIn", ResourcesPath.Instance.StreamingAssetPath + "builtin");

            }

#endif

            if (!firstLaunch)

            {

                done = true;