Skip to content

Commit 1f53275

Browse files
committed
修复部分LUA报错
1 parent a90e8e7 commit 1f53275

35 files changed

+712
-20
lines changed

Assets/Resources/ResourcesManifest.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,8 @@ langdata_chinesesimplified data/language/langdata_chinesesimplified
1616
guidedata data/guidedata
1717
item data/item
1818
testdata data/testdata
19-
gameobject 1 prefab/gameobject 1
20-
gameobject 2 prefab/gameobject 2
2119
gameobject prefab/gameobject
2220
gogo prefab/gogo
23-
uitest 1 prefab/uitest 1
24-
uitest 2 prefab/uitest 2
25-
uitest 3 prefab/uitest 3
26-
uitest 4 prefab/uitest 4
27-
uitest 5 prefab/uitest 5
28-
uitest 6 prefab/uitest 6
2921
uitest prefab/uitest
3022
dl_01 sprite/dl_01
3123
dl_01.png sprite/dl_01.png
@@ -57,11 +49,5 @@ image_item ui/testwindow/image_item
5749
testwindow ui/testwindow/testwindow
5850
uimanager ui/uimanager
5951
gameobject_adasd gameobject_adasd
60-
new material 2 new material 2
61-
new material 3 new material 3
62-
new material 4 new material 4
63-
new material 5 new material 5
64-
new material 6 new material 6
65-
new material new material
6652
resourcesmanifest resourcesmanifest
6753
version version

Assets/Script/Core/Lua/LuaManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void Init()
3535
try
3636
{
3737
s_state.Start();
38-
LuaBinder.Bind(s_state);
38+
//LuaBinder.Bind(s_state);
3939
ApplicationManager.s_OnApplicationUpdate += Update;
4040
}
4141
catch (Exception e)

Assets/Script/Core/Lua/ToLua/Editor/Custom/CustomSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44
#if USE_LUA
5-
using BindType = ToLuaMenu.BindType;.
5+
using BindType = ToLuaMenu.BindType;
66
#endif
77

88
public static class CustomSettings

Assets/Script/Core/Lua/ToLua/Editor/ToLuaExport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if USE_Lua
1+
#if USE_LUA
22
/*
33
Copyright (c) 2015-2016 topameng([email protected])
44

Assets/Script/Core/Lua/ToLua/Plugins/Android.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Script/Core/Lua/ToLua/Plugins/Android/libs.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Script/Core/Lua/ToLua/Plugins/Android/libs/armeabi-v7a.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Script/Core/Lua/ToLua/Plugins/Android/libs/x86.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
92.5 KB
Binary file not shown.

Assets/Script/Core/Lua/ToLua/Plugins/CString.dll.meta

Lines changed: 108 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)