diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..472019da2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +Library/ +Temp/ +obj/ +Assets/LuaFramework/ToLua/Source/Generate/ +.vs/MyLuaFramework_UGUI/v15/Server/sqlite3/storage.ide-wal +.vs/MyLuaFramework_UGUI/v15/Server/sqlite3/storage.ide-shm +.vs/MyLuaFramework_UGUI/v15/Server/sqlite3/storage.ide +.vs/MyLuaFramework_UGUI/v15/Server/sqlite3/db.lock +.vs/MyLuaFramework_UGUI/v15/.suo +Logs/Packages-Update.log +Assembly-CSharp.csproj +Assembly-CSharp-Editor.csproj +MyLuaFramework_UGUI.sln +Assets/StreamingAssets/ diff --git a/Assets/LuaFramework/Editor/CustomSettings.cs b/Assets/LuaFramework/Editor/CustomSettings.cs index 419536138..1bf6c233e 100644 --- a/Assets/LuaFramework/Editor/CustomSettings.cs +++ b/Assets/LuaFramework/Editor/CustomSettings.cs @@ -88,7 +88,7 @@ public static class CustomSettings _GT(typeof(Component)), _GT(typeof(Transform)), _GT(typeof(Material)), - _GT(typeof(Light)), + //_GT(typeof(Light)), _GT(typeof(Rigidbody)), _GT(typeof(Camera)), _GT(typeof(AudioSource)), @@ -113,7 +113,7 @@ public static class CustomSettings _GT(typeof(CameraClearFlags)), _GT(typeof(AudioClip)), _GT(typeof(AssetBundle)), - _GT(typeof(ParticleSystem)), + //_GT(typeof(ParticleSystem)), _GT(typeof(AsyncOperation)).SetBaseType(typeof(System.Object)), _GT(typeof(LightType)), _GT(typeof(SleepTimeout)), @@ -148,9 +148,9 @@ public static class CustomSettings _GT(typeof(PlayMode)), _GT(typeof(WrapMode)), - _GT(typeof(QualitySettings)), + //_GT(typeof(QualitySettings)), _GT(typeof(RenderSettings)), - _GT(typeof(BlendWeights)), + _GT(typeof(SkinWeights)), _GT(typeof(RenderTexture)), _GT(typeof(Resources)), _GT(typeof(LuaProfiler)), @@ -194,7 +194,7 @@ public static class CustomSettings typeof(AnimationClip), typeof(AnimationState), - typeof(BlendWeights), + typeof(SkinWeights), typeof(RenderTexture), typeof(Rigidbody), }; diff --git a/Assets/LuaFramework/Editor/Packager.cs b/Assets/LuaFramework/Editor/Packager.cs index c917050d7..186a80adb 100644 --- a/Assets/LuaFramework/Editor/Packager.cs +++ b/Assets/LuaFramework/Editor/Packager.cs @@ -36,7 +36,7 @@ public static void BuildiPhoneResource() { #if UNITY_5 target = BuildTarget.iOS; #else - target = BuildTarget.iPhone; + target = BuildTarget.iOS; #endif BuildAssetResource(target); } diff --git a/Assets/LuaFramework/Scripts/Common/LuaLoader.cs b/Assets/LuaFramework/Scripts/Common/LuaLoader.cs index c839d8d67..ab5843d5e 100644 --- a/Assets/LuaFramework/Scripts/Common/LuaLoader.cs +++ b/Assets/LuaFramework/Scripts/Common/LuaLoader.cs @@ -32,7 +32,7 @@ public void AddBundle(string bundleName) { string url = Util.DataPath + bundleName.ToLower(); if (File.Exists(url)) { var bytes = File.ReadAllBytes(url); - AssetBundle bundle = AssetBundle.CreateFromMemoryImmediate(bytes); + AssetBundle bundle = AssetBundle.LoadFromMemory(bytes); if (bundle != null) { bundleName = bundleName.Replace("lua/", "").Replace(".unity3d", ""); diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b0ac5107b..eb7d4a0f0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.0.0f4 -m_StandardAssetsVersion: 0 +m_EditorVersion: 2019.1.2f1 +m_EditorVersionWithRevision: 2019.1.2f1 (3e18427e571f)