Skip to content

对Unity 2019.1.2f1进行了适配 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CraneInForest wants to merge 1 commit into
base: master
Choose a base branch
from
Open

对Unity 2019.1.2f1进行了适配 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
10 changes: 5 additions & 5 deletions Assets/LuaFramework/Editor/CustomSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand All @@ -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)),
Expand Down Expand Up @@ -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)),
Expand Down Expand Up @@ -194,7 +194,7 @@ public static class CustomSettings
typeof(AnimationClip),
typeof(AnimationState),

typeof(BlendWeights),
typeof(SkinWeights),
typeof(RenderTexture),
typeof(Rigidbody),
};
Expand Down
2 changes: 1 addition & 1 deletion Assets/LuaFramework/Editor/Packager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static void BuildiPhoneResource() {
#if UNITY_5
target = BuildTarget.iOS;
#else
target = BuildTarget.iPhone;
target = BuildTarget.iOS;
#endif
BuildAssetResource(target);
}
Expand Down
2 changes: 1 addition & 1 deletion Assets/LuaFramework/Scripts/Common/LuaLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", "");
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 5.0.0f4
m_StandardAssetsVersion: 0
m_EditorVersion: 2019.1.2f1
m_EditorVersionWithRevision: 2019.1.2f1 (3e18427e571f)