diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd4ec9f --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +/[Ll]ibrary/ +/[Tt]emp/ +/[Oo]bj/ +/[Bb]uild/ +/[Bb]uilds/ +/Assets/AssetStoreTools* + +# Visual Studio 2015 cache directory +/.vs/ + +# Autogenerated VS/MD/Consulo solution and project files +ExportedObj/ +.consulo/ +*.csproj +*.unityproj +*.sln +*.suo +*.tmp +*.user +*.userprefs +*.pidb +*.booproj +*.svd +*.pdb + +# Unity3D generated meta files +*.pidb.meta + +# Unity3D Generated File On Crash Reports +sysinfo.txt + +# Builds +*.apk +*.unitypackage +Assets/_Ignore +_Ignore.meta +.idea +Logs +Assets/Plugins/Editor/JetBrains +Assets/Plugins/Editor/JetBrains.meta +Recordings diff --git a/Assets/_Complete-Game/Scripts/Core/LuaInterface/LuaScriptManager.cs b/Assets/_Complete-Game/Scripts/Core/LuaInterface/LuaScriptManager.cs old mode 100755 new mode 100644 index 49058f2..1812120 --- a/Assets/_Complete-Game/Scripts/Core/LuaInterface/LuaScriptManager.cs +++ b/Assets/_Complete-Game/Scripts/Core/LuaInterface/LuaScriptManager.cs @@ -1,4 +1,6 @@ using System.Collections.Generic; +using System.IO; +using System.Text; using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement; diff --git a/README-CN.txt b/README-CN.txt index c31c50a..f416ca6 100755 --- a/README-CN.txt +++ b/README-CN.txt @@ -3,7 +3,7 @@ demo主要演示了unity环境的下的liveCoding方案,包含 **资源、Lua # 项目目录说明 -------- -除大多数目录与SurvivalShooterTutorial一致以外,demo还包含了以下几个目录。 +除大多数目录与SurvivalShooterTutorial一致以外,demo还包含了以下几个目录。Demo场景需要从Start场景中进入。 ``` @@ -59,4 +59,4 @@ adb reverse tcp:53036 tcp:53036 ## C#的LiveCoding: 此特性需要使用修改后的AndroidPlayer来build apk,将来可能整合入Unity中国版,对解决中国游戏开发者的一些特殊需求应该也会有所帮助。 -修改C#代码后,点击顶部菜单中的G6HotFix->NewScirptBuild&Push Dll, 等待编辑器中进度条消失后,重启手机上的应用即可。 \ No newline at end of file +修改C#代码后,点击顶部菜单中的G6HotFix->NewScirptBuild&Push Dll, 等待编辑器中进度条消失后,重启手机上的应用即可。