Merge pull request #4 from mr-kelly/staging

Staging to master : v0.11.x

.gitignore

@@ -233,6 +233,7 @@ _Pvt_Extensions
 .fake/
 /KSFramework/Assets/Plugins/Editor/KEngineEditor
 /KSFramework/Assets/Plugins/KEngine
+/KSFramework/Assets/Plugins/Slua_Managed
 /KSFramework/Library
 /KSFramework/Temp
 /KSFramework/*.csproj

Install.bat

@@ -49,13 +49,14 @@ mkdir KSFramework\Assets\SLua\Editor
 xcopy slua\Assets\SLua\Editor\CustomEditor.cs KSFramework\Assets\SLua\Editor /S/Y/R/I
 xcopy slua\Assets\SLua\Editor\LuaCodeGen.cs KSFramework\Assets\SLua\Editor /S/Y/R/I
 
+rmdir KSFramework\Assets\Plugins\Slua_Managed
 mklink /J KSFramework\Assets\Plugins\Slua_Managed slua\Assets\Plugins\Slua_Managed
 
-xcopy slua\Assets\Plugins\Android KSFramework\Assets\Plugins\Android /S/Y/R/I
-xcopy slua\Assets\Plugins\iOS KSFramework\Assets\Plugins\iOS /S/Y/R/I
-xcopy slua\Assets\Plugins\slua.bundle KSFramework\Assets\Plugins\slua.bundle /S/Y/R/I
-xcopy slua\Assets\Plugins\x64 KSFramework\Assets\Plugins\x64 /S/Y/R/I
-xcopy slua\Assets\Plugins\x86 KSFramework\Assets\Plugins\x86 /S/Y/R/I
+xcopy slua\Assets\Plugins\Android\* KSFramework\Assets\Plugins\Android /S/Y/R/I
+xcopy slua\Assets\Plugins\iOS\* KSFramework\Assets\Plugins\iOS /S/Y/R/I
+xcopy slua\Assets\Plugins\slua.bundle\* KSFramework\Assets\Plugins\slua.bundle /S/Y/R/I
+xcopy slua\Assets\Plugins\x64\* KSFramework\Assets\Plugins\x64 /S/Y/R/I
+xcopy slua\Assets\Plugins\x86\* KSFramework\Assets\Plugins\x86 /S/Y/R/I
 
 echo Finish!
 ping -n 5 127.0.0.1>nul 

Install.sh

@@ -0,0 +1,55 @@
+# Submodule update
+# git submodule update --recursive
+SRC_ASSETS_PATH=$PWD/KEngine/KEngine.UnityProject/Assets
+DST_ASSETS_PATH=$PWD/KSFramework/Assets
+DST_PLUGIN_PATH=$PWD/KSFramework/Assets/Plugins/KEngine
+DST_EDITOR_PATH=$PWD/KSFramework/Assets/Plugins/Editor/KEngineEditor
+
+
+# Resources
+
+mkdir $DST_ASSETS_PATH/../Product/SettingSource
+mkdir $DST_ASSETS_PATH/../Product/Bundles
+
+#  Codes
+
+echo $SRC_ASSETS_PATH
+echo $DST_PLUGIN_PATH
+
+mkdir $DST_PLUGIN_PATH 2>nul
+rm $DST_PLUGIN_PATH/KEngine
+ln -s $SRC_ASSETS_PATH/KEngine $DST_PLUGIN_PATH/KEngine 
+rm $DST_PLUGIN_PATH/KEngine.Lib
+ln -s $SRC_ASSETS_PATH/KEngine.Lib $DST_PLUGIN_PATH/KEngine.Lib 
+rm $DST_PLUGIN_PATH/KEngine.UI
+ln -s $SRC_ASSETS_PATH/KEngine.UI $DST_PLUGIN_PATH/KEngine.UI 
+
+mkdir $DST_EDITOR_PATH 2>nul
+rm $DST_EDITOR_PATH/KEngine.Editor
+ln -s $SRC_ASSETS_PATH/KEngine.Editor/Editor $DST_EDITOR_PATH/KEngine.Editor 
+rm $DST_EDITOR_PATH/KEngine.EditorTools
+ln -s $SRC_ASSETS_PATH/KEngine.EditorTools/Editor $DST_EDITOR_PATH/KEngine.EditorTools 
+rm $DST_EDITOR_PATH/KEngine.UI.Editor
+ln -s $SRC_ASSETS_PATH/KEngine.UI.Editor/Editor $DST_EDITOR_PATH/KEngine.UI.Editor 
+
+mkdir -p KSFramework/Assets/Plugins/libs/ 2>nul
+cp -rf $SRC_ASSETS_PATH/Plugins/Android/libs/KEngine.Android.jar KSFramework/Assets/Plugins/Android/libs/KEngine.Android.jar
+
+# SLua
+mkdir KSFramework/Assets/SLua
+mkdir KSFramework/Assets/SLua/Resources
+mkdir KSFramework/Assets/SLua/Editor
+cp -rf slua/Assets/SLua/Editor/CustomEditor.cs KSFramework/Assets/SLua/Editor
+cp -rf slua/Assets/SLua/Editor/LuaCodeGen.cs KSFramework/Assets/SLua/Editor
+
+rm -rf KSFramework/Assets/Plugins/Slua_Managed 
+ln -s $PWD/slua/Assets/Plugins/Slua_Managed KSFramework/Assets/Plugins/Slua_Managed 
+
+cp -rf slua/Assets/Plugins/Android/* KSFramework/Assets/Plugins/Android
+cp -rf slua/Assets/Plugins/iOS/* KSFramework/Assets/Plugins/iOS
+cp -rf slua/Assets/Plugins/slua.bundle/* KSFramework/Assets/Plugins/slua.bundle
+cp -rf slua/Assets/Plugins/x64/* KSFramework/Assets/Plugins/x64
+cp -rf slua/Assets/Plugins/x86/* KSFramework/Assets/Plugins/x86
+
+echo Finish!
+

KSFramework/Assets/BundleEditing/UI/Login.unity

@@ -13,7 +13,7 @@ SceneSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 7
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -37,12 +37,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
 --- !u!157 &4
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 7
   m_GIWorkflowMode: 1
-  m_LightmapsMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -53,17 +53,22 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 3
+    serializedVersion: 4
     m_Resolution: 1
     m_BakeResolution: 50
     m_TextureWidth: 1024
     m_TextureHeight: 1024
+    m_AO: 0
     m_AOMaxDistance: 1
-    m_Padding: 2
     m_CompAOExponent: 0
+    m_CompAOExponentDirect: 0
+    m_Padding: 2
     m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
     m_TextureCompression: 0
+    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
+    m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 1024
     m_ReflectionCompression: 2
   m_LightingDataAsset: {fileID: 0}
@@ -307,6 +312,7 @@ GameObject:
   m_Component:
   - 224: {fileID: 987455120}
   - 114: {fileID: 987455124}
+  - 114: {fileID: 987455125}
   - 223: {fileID: 987455123}
   - 114: {fileID: 987455122}
   - 114: {fileID: 987455121}
@@ -402,10 +408,31 @@ MonoBehaviour:
   m_GameObject: {fileID: 987455119}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 327bf15252499524ca2de7a67ab4f467, type: 3}
+  m_Script: {fileID: 11500000, guid: 938311ed4b5a34590af2bad889d53090, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   StringArgument: 
+--- !u!114 &987455125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 987455119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0c01f3f0b88b4448ab1ccfa117a1d57e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  OutletInfos:
+  - Name: LoginButton
+    ComponentType: UnityEngine.UI.Button
+    Object: {fileID: 1155933765}
+  - Name: LoginButtonText
+    ComponentType: UnityEngine.UI.Text
+    Object: {fileID: 1827155046}
+  - Name: LoginText
+    ComponentType: UnityEngine.UI.Text
+    Object: {fileID: 359997553}
 --- !u!1 &1155933765
 GameObject:
   m_ObjectHideFlags: 0
@@ -481,7 +508,29 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1155933768}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 0}
+        m_MethodName: 
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 0}
+        m_MethodName: 
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &1155933768