Merge pull request #5 from mr-kelly/master

docs ~ and some api

Author: mr-kelly

Product/setting/test_tab.bytes renamed to App/setting/test_tab.bytes

@@ -31,27 +31,8 @@ struct XVersionControlInfo
 
 	static int PushedAssetCount = 0;
 
-    public event Action<UnityEngine.Object, string, string> BeforeBuildAssetBundleEvent;
-
-    // 鉤子函數, 動態改變某些打包行為
-    public static bool HookFunc(System.Type classType, string funcName, params object[] args)
-    {
-        if (classType == null)
-        {
-            return false;
-        }
-
-        MethodInfo methodInfo = classType.GetMethod(funcName, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
-        if (methodInfo == null)
-        {
-            return false;
-        }
-
-        CBase.Log("HookFunc- {0}:{1}", classType.Name, funcName);
-        methodInfo.Invoke(null, args);
-
-        return true;
-    }
+    public static event Action<UnityEngine.Object, string, string> BeforeBuildAssetBundleEvent;
+    public static event Action<UnityEngine.Object, string, string> AfterBuildAssetBundleEvent;
 
     #region 打包功能
 	public static string MakeSureExportPath(string path, BuildTarget buildTarget)
@@ -154,7 +135,11 @@ public static uint BuildAssetBundle(Object asset, string path, BuildTarget build
         string relativePath = path;
 		path = MakeSureExportPath(path, buildTarget);
 
-		if ((prefabType == PrefabType.None && AssetDatabase.GetAssetPath(asset) == string.Empty) ||
+	    if (asset is Texture)
+	    {
+	        asset = asset; // Texutre不复制拷贝一份
+	    }
+		else if ((prefabType == PrefabType.None && AssetDatabase.GetAssetPath(asset) == string.Empty) ||
 			(prefabType == PrefabType.ModelPrefabInstance))
 		{
 			tmpObj = (GameObject)GameObject.Instantiate(asset);
@@ -166,8 +151,8 @@ public static uint BuildAssetBundle(Object asset, string path, BuildTarget build
 			asset = PrefabUtility.GetPrefabParent(asset);
 		}
 
-
-        HookFunc(typeof(CBuildTools), "BeforeBuildAssetBundle", asset, path, relativePath);
+	    if (BeforeBuildAssetBundleEvent != null)
+	        BeforeBuildAssetBundleEvent(asset, path, relativePath);
 
 		uint crc;
 		BuildPipeline.BuildAssetBundle(
@@ -186,8 +171,8 @@ public static uint BuildAssetBundle(Object asset, string path, BuildTarget build
 
 		CBase.Log("生成文件： {0}", path);
 
-
-        HookFunc(typeof(CBuildTools), "AfterBuildAssetBundle", asset, path, relativePath);
+        if (AfterBuildAssetBundleEvent != null)
+            AfterBuildAssetBundleEvent(asset, path, relativePath);
 
 		return crc;
 	}

Assets/CosmosEngine/Editor/CosmosEngineEditor/CBuildTools.cs

@@ -29,7 +29,11 @@ public partial class CBuild_UI : AutoBuildBase
     public override string GetDirectory() { return "UI"; }
     public override string GetExtention() { return "*.unity"; }
 
-    public static event Action<CBuild_UI> Custom_BeginExport;
+    public static event Action<CBuild_UI> BeginExportEvent;
+    public static event Action<CBuild_UI, string, string, GameObject> ExportCurrentUIEvent;
+    public static event Action ExportUIMenuEvent;
+    public static event Action<CBuild_UI> EndExportEvent;
+
 
     public static string GetBuildRelPath(string uiName)
     {
@@ -39,7 +43,12 @@ public static string GetBuildRelPath(string uiName)
     public void ExportCurrentUI()
     {
         CreateTempPrefab();
-        if (!CBuildTools.HookFunc(typeof(CBuild_UI), "Custom_ExportCurrentUI", this, UIScenePath, UIName, TempPanelObject))
+
+        if (ExportCurrentUIEvent != null)
+        {
+            ExportCurrentUIEvent(this, UIScenePath, UIName, TempPanelObject);
+        }
+        else
         {
             CBuildTools.BuildAssetBundle(TempPanelObject, GetBuildRelPath(UIName));
         }
@@ -48,7 +57,10 @@ public void ExportCurrentUI()
 
     public override void BeginExport()
     {
-        CBuildTools.HookFunc(typeof(CBuild_UI), "Custom_BeginExport", this);
+        if (BeginExportEvent != null)
+        {
+            BeginExportEvent(this);
+        }
     }
 
     public override void Export(string path)
@@ -65,7 +77,10 @@ public override void Export(string path)
 
     public override void EndExport()
     {
-        CBuildTools.HookFunc(typeof(CBuild_UI), "Custom_EndExport", this);
+        if (EndExportEvent != null)
+        {
+            EndExportEvent(this);
+        }
 
     }
 
@@ -208,8 +223,9 @@ public static void CreateUI()
     [MenuItem("CosmosEngine/UI/Export Current UI %&U")]
     public static void ExportUIMenu()
     {
-        CBuildTools.HookFunc(typeof(CBuild_UI), "Custom_ExportUIMenu");
-
+        if (ExportUIMenuEvent != null)
+            ExportUIMenuEvent();
+        
         CBuild_UI uiBuild = new CBuild_UI();
         if (!uiBuild.CheckUI(true))
             return;

Assets/CosmosEngine/Editor/CosmosEngineEditor/CBuild_UI.cs

@@ -30,8 +30,8 @@ public class CUIManager : ICModule
     public Dictionary<string, CUILoadState> UIWindows = new Dictionary<string, CUILoadState>();
     public bool UIRootLoaded = false;
 
-    public event System.Action<string> OpenWindowEvent;
-    public event System.Action<string> CloseWindowEvent;
+    public static event Action<CUIController> OnOpenEvent;
+    public static event Action<CUIController> OnCloseEvent;
 
     private CUIManager()
     {
@@ -164,7 +164,8 @@ void OnDynamicWindowCallback(CUIController _ui, object[] _args)
             originArgs[i - 2] = _args[i];
 
         InitWindow(_instanceUIState, uiBase, true, originArgs);
-        OnUIWindowLoaded(_instanceUIState, uiBase);
+        OnUIWindowLoadedCallbacks(_instanceUIState, uiBase);
+        
     }
 
     public void CloseWindow(Type t)
@@ -179,9 +180,6 @@ public void CloseWindow<T>()
 
     public void CloseWindow(string name)
     {
-        if (CloseWindowEvent != null)
-            CloseWindowEvent(name);
-
         CUILoadState uiState;
         if (!UIWindows.TryGetValue(name, out uiState))
         {
@@ -195,6 +193,9 @@ public void CloseWindow(string name)
         }
 
         uiState.UIWindow.gameObject.SetActive(false);
+
+        if (OnCloseEvent != null)
+            OnCloseEvent(uiState.UIWindow);
         uiState.UIWindow.OnClose();
 
         if (!uiState.IsStaticUI)
@@ -315,7 +316,7 @@ IEnumerator LoadUIAssetBundle(string path, string name, CUILoadState openState)
 
         uiBase.UIName = uiBase.UITemplateName = openState.Name;
         InitWindow(openState, uiBase, openState.OpenWhenFinish, openState.OpenArgs);
-        OnUIWindowLoaded(openState, uiBase);
+        OnUIWindowLoadedCallbacks(openState, uiBase);
 
     }
 
@@ -382,16 +383,18 @@ public void CallUI<T>(Action<T, object[]> callback, params object[] args) where
 
     void OnOpen(CUILoadState uiState, params object[] args)
     {
-        if (OpenWindowEvent != null)
-            OpenWindowEvent(uiState.UIType);
-
         CUIController uiBase = uiState.UIWindow;
         uiBase.OnPreOpen();
         if (uiBase.gameObject.activeSelf)
+        {
             uiBase.OnClose();
+        }
         else
             uiBase.gameObject.SetActive(true);
 
+
+        if (OnOpenEvent != null)
+            OnOpenEvent(uiBase);
         uiBase.OnOpen(args);
     }
 
@@ -407,7 +410,7 @@ void InitWindow(CUILoadState uiState, CUIController uiBase, bool open, params ob
         }
 
     }
-    void OnUIWindowLoaded(CUILoadState uiState, CUIController uiBase)
+    void OnUIWindowLoadedCallbacks(CUILoadState uiState, CUIController uiBase)
     {
         //if (openState.OpenWhenFinish)  // 加载完打开 模式下，打开时执行回调
         {

Assets/CosmosEngine/Scripts/Utils/CCollisionDetector.cs.meta renamed to Assets/CosmosEngine/Editor/CosmosEngineEditor/CTestTools.cs.meta

@@ -55,6 +55,7 @@ void CreateUIRoot()
         CBase.Assert(UiRoot);
         UiRoot.scalingStyle = UIRoot.Scaling.ConstrainedOnMobiles;
         UiRoot.manualHeight = 1920;
+        UiRoot.manualWidth = 1080;
 
         GameObject panelRootObj = new GameObject("PanelRoot");
         CTool.SetChild(panelRootObj.transform, uiRootobj.transform);