diff --git a/.gitignore b/.gitignore
index 53f6a2f1..e7180d03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -246,3 +246,4 @@ _Pvt_Extensions
*UnityVS*
+/KSFramework/Assets/StreamingAssets/Setting
diff --git a/KEngine b/KEngine
index fcd9112d..03d515ea 160000
--- a/KEngine
+++ b/KEngine
@@ -1 +1 @@
-Subproject commit fcd9112d97a5425948126961c2d45073833bc966
+Subproject commit 03d515ea5fae473d60685f520bf63cb3e6a6c4b0
diff --git a/KSFramework/Assets/Plugins/KSFramework/Modules/LuaModule/Editor/LuaModuleEditor.cs b/KSFramework/Assets/Plugins/KSFramework/Modules/LuaModule/Editor/LuaModuleEditor.cs
index 3875aa6c..6d3cee75 100644
--- a/KSFramework/Assets/Plugins/KSFramework/Modules/LuaModule/Editor/LuaModuleEditor.cs
+++ b/KSFramework/Assets/Plugins/KSFramework/Modules/LuaModule/Editor/LuaModuleEditor.cs
@@ -22,6 +22,8 @@
// License along with this library.
#endregion
+
+using System;
using UnityEngine;
using System.Collections;
using System.IO;
@@ -42,6 +44,10 @@ public class LuaModuleEditor
///
private static bool _hasBeforeBuildApp = false;
+ ///
+ /// 复制文件事件, 可以进行加密行为
+ ///
+ public static Action OnCopyFile;
///
/// 这里可以进行DLL篡改, 这里PostProcessScene时,DLL已经被生成了
///
@@ -73,6 +79,8 @@ private static void OnPostProcessScene()
Directory.CreateDirectory(Path.GetDirectoryName(toPath));
File.Copy(cleanPath, toPath, true);
+ if (OnCopyFile != null)
+ OnCopyFile(toPath);
luaCount++;
}
AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
diff --git a/KSFramework/Assets/StreamingAssets/Setting/GameConfig+Base.bytes b/KSFramework/Product/Setting/GameConfig+Base.bytes
similarity index 100%
rename from KSFramework/Assets/StreamingAssets/Setting/GameConfig+Base.bytes
rename to KSFramework/Product/Setting/GameConfig+Base.bytes
diff --git a/KSFramework/Assets/StreamingAssets/Setting/GameConfig+TSV.bytes b/KSFramework/Product/Setting/GameConfig+TSV.bytes
similarity index 100%
rename from KSFramework/Assets/StreamingAssets/Setting/GameConfig+TSV.bytes
rename to KSFramework/Product/Setting/GameConfig+TSV.bytes
diff --git a/KSFramework/Assets/StreamingAssets/Setting/I18N/en_US.bytes b/KSFramework/Product/Setting/I18N/en_US.bytes
similarity index 100%
rename from KSFramework/Assets/StreamingAssets/Setting/I18N/en_US.bytes
rename to KSFramework/Product/Setting/I18N/en_US.bytes
diff --git a/KSFramework/Assets/StreamingAssets/Setting/I18N/zh_CN.bytes b/KSFramework/Product/Setting/I18N/zh_CN.bytes
similarity index 100%
rename from KSFramework/Assets/StreamingAssets/Setting/I18N/zh_CN.bytes
rename to KSFramework/Product/Setting/I18N/zh_CN.bytes
diff --git a/KSFramework/Assets/StreamingAssets/Setting/StringsTable.bytes b/KSFramework/Product/Setting/StringsTable.bytes
similarity index 100%
rename from KSFramework/Assets/StreamingAssets/Setting/StringsTable.bytes
rename to KSFramework/Product/Setting/StringsTable.bytes
diff --git a/KSFramework/Assets/StreamingAssets/Setting/Test.bytes b/KSFramework/Product/Setting/Test.bytes
similarity index 100%
rename from KSFramework/Assets/StreamingAssets/Setting/Test.bytes
rename to KSFramework/Product/Setting/Test.bytes
diff --git a/KSFramework/ProjectSettings/EditorBuildSettings.asset b/KSFramework/ProjectSettings/EditorBuildSettings.asset
index 6dc24f7d..f380a2cf 100644
--- a/KSFramework/ProjectSettings/EditorBuildSettings.asset
+++ b/KSFramework/ProjectSettings/EditorBuildSettings.asset
@@ -4,4 +4,6 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
- m_Scenes: []
+ m_Scenes:
+ - enabled: 1
+ path: Assets/Game.unity
diff --git a/KSFramework/ProjectSettings/GraphicsSettings.asset b/KSFramework/ProjectSettings/GraphicsSettings.asset
index 5a96ca8a..794c061b 100644
--- a/KSFramework/ProjectSettings/GraphicsSettings.asset
+++ b/KSFramework/ProjectSettings/GraphicsSettings.asset
@@ -22,7 +22,7 @@ GraphicsSettings:
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_ShaderSettings:
- useScreenSpaceShadows: 1
+ useScreenSpaceShadows: 0
m_BuildTargetShaderSettings: []
m_LightmapStripping: 0
m_FogStripping: 0