Merge pull request #171 from soulgame/settings

put lua3rdmeta along with sluasettings
pangweiwei · Mar 2, 2017 · adc7fff · adc7fff
2 parents 9d48280 + 49b9f42
commit adc7fff
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/Assets/Plugins/Slua_Managed/Lua3rdMeta.cs b/Assets/Plugins/Slua_Managed/Lua3rdMeta.cs
@@ -61,7 +61,7 @@ public static Lua3rdMeta Instance{
 				#if UNITY_EDITOR
 				if(_instance == null){
 					_instance = ScriptableObject.CreateInstance<Lua3rdMeta>();
-					string path = "Assets/Slua/Meta/Resources";
+					string path = "Assets/Slua/Resources";
 					if(!Directory.Exists(path)){
 						Directory.CreateDirectory(path);
 					}

diff --git a/Assets/Slua/Meta.meta b/Assets/Slua/Meta.meta
diff --git a/Assets/Slua/Meta/Resources.meta b/Assets/Slua/Meta/Resources.meta
diff --git a/Assets/Slua/Resources/lua3rdmeta.asset b/Assets/Slua/Resources/lua3rdmeta.asset
diff --git a/Assets/Slua/Resources/lua3rdmeta.asset.meta b/Assets/Slua/Resources/lua3rdmeta.asset.meta
diff --git a/Assets/Slua/Resources/setting.asset b/Assets/Slua/Resources/setting.asset
diff --git a/Assets/Slua/Resources/setting.asset.meta b/Assets/Slua/Resources/setting.asset.meta