Merge pull request #6 from mr-kelly/master

目录规范化改名

Author: mr-kelly

Assets/CosmosEngine/Editor/CosmosEngineEditor/CAutoResourceBuilder.cs

@@ -37,14 +37,14 @@ public static void ProductExport(AutoBuildBase export)
         if (ext.StartsWith("dir:"))  // 目錄下的所有文件，包括子文件夾
         {
             string newExt = ext.Replace("dir:", "");
-            itemArray = Directory.GetFiles("Assets/Product/" + export.GetDirectory(), newExt, SearchOption.AllDirectories);
+            itemArray = Directory.GetFiles("Assets/_ResourcesBuild_/" + export.GetDirectory(), newExt, SearchOption.AllDirectories);
         }
         else if (ext == "dir")
-            itemArray = Directory.GetDirectories("Assets/Product/" + export.GetDirectory());
+            itemArray = Directory.GetDirectories("Assets/_ResourcesBuild_/" + export.GetDirectory());
         else if (ext == "")
             itemArray = new string[0];
         else
-            itemArray = Directory.GetFiles("Assets/Product/" + export.GetDirectory(), export.GetExtention());  // 不包括子文件夾
+            itemArray = Directory.GetFiles("Assets/_ResourcesBuild_/" + export.GetDirectory(), export.GetExtention());  // 不包括子文件夾
 
         export.BeginExport();
         foreach (string item in itemArray)

Assets/CosmosEngine/Editor/CosmosEngineEditor/CBuild_UI.cs

@@ -88,15 +88,15 @@ void CreateTempPrefab()
     {
         TempPanelObject = (GameObject)GameObject.Instantiate(WindowObject);
 
-        if (WindowObject.GetComponent<UIPanel>() == null)
-        {
-            // 读取UIPanel的depth, 遍历所有UI控件，将其depth加上UIPanel Depth， 以此设置层级关系
-            // 如PanelRoot Depth填10,  子控件填0,1,2   打包后，子控件层级为 10 << 5 | 1 = 320, 321, 322
-            foreach (UIWidget uiWidget in TempPanelObject.GetComponentsInChildren<UIWidget>(true))
-            {
-                uiWidget.depth = (PanelRoot.depth + 15) << 5 | (uiWidget.depth + 15);  // + 15是为了杜绝负数！不要填-15以上的
-            }
-        }
+        //if (WindowObject.GetComponent<UIPanel>() == null)
+        //{
+        //    // 读取UIPanel的depth, 遍历所有UI控件，将其depth加上UIPanel Depth， 以此设置层级关系
+        //    // 如PanelRoot Depth填10,  子控件填0,1,2   打包后，子控件层级为 10 << 5 | 1 = 320, 321, 322
+        //    foreach (UIWidget uiWidget in TempPanelObject.GetComponentsInChildren<UIWidget>(true))
+        //    {
+        //        uiWidget.depth = (PanelRoot.depth + 15) << 5 | (uiWidget.depth + 15);  // + 15是为了杜绝负数！不要填-15以上的
+        //    }
+        //}
 
         foreach (UIButton go in TempPanelObject.GetComponentsInChildren<UIButton>(true))
         {
@@ -186,7 +186,10 @@ public static void CreateNewUI()
 
         UIRoot uiRoot = uiRootObj.AddComponent<UIRoot>();
         uiRoot.scalingStyle = UIRoot.Scaling.ConstrainedOnMobiles;
-        uiRoot.manualHeight = 960;
+        uiRoot.manualHeight = 1920;
+        uiRoot.manualWidth = 1080;
+        uiRoot.fitHeight = true;
+        uiRoot.fitWidth = true;
 
         GameObject cameraObj = new GameObject("Camera");
         cameraObj.layer = (int)CLayerDef.UI;
@@ -236,7 +239,7 @@ public static void ExportUIMenu()
     }
 
     /// <summary>
-    /// Buidl All UI Scene under Assets/Products/ folder
+    /// Buidl All UI Scene under Assets/_ResourcesBuild_s/ folder
     /// </summary>
     [MenuItem("CosmosEngine/UI/Export All UI")]
     public static void ExportAllUI()

Assets/CosmosEngine/Editor/CosmosEngineEditor/CTestTools.cs.meta

@@ -20,7 +20,9 @@ public class CBehaviour : MonoBehaviour
     public GameObject _GameObject;
     protected bool IsDeleted = false;
 
-    static bool IsApplicationQuited = false;  // 全局标记, 程序是否退出状态
+    static bool _IsApplicationQuited = false;  // 全局标记, 程序是否退出状态
+    public static bool IsApplicationQuited {get { return _IsApplicationQuited; }}
+
     public static System.Action ApplicationQuitEvent;
 
     private float _TimeScale = 1f;  // TODO: In Actor, Bullet,....
@@ -71,10 +73,10 @@ protected virtual void OnDestroy()
 
     void OnApplicationQuit()
     {
-        if (!IsApplicationQuited)
+        if (!_IsApplicationQuited)
             CBase.Log("OnApplicationQuit!");
 
-        IsApplicationQuited = true;
+        _IsApplicationQuited = true;
 
         if (ApplicationQuitEvent != null)
             ApplicationQuitEvent();

Assets/CosmosEngine/Scripts/Base/CBehaviour.cs

@@ -125,7 +125,7 @@ public void DestroyGameObjectChildren(GameObject go)
     /// 模仿 NGUISelectionTool的同名方法，将位置旋转缩放清零
     /// </summary>
     /// <param name="t"></param>
-    public void ClearLocalTransform(Transform t)
+    public void ResetLocalTransform(Transform t)
     {
         t.localPosition = Vector3.zero;
         t.localRotation = Quaternion.identity;
@@ -160,7 +160,7 @@ void _ResizeUIWidgetContainerGameObjects(UIWidgetContainer uiGrid, int resizeCou
             {
                 newTemplate = Instantiate(templateForNew) as GameObject;
                 newTemplate.transform.parent = uiGrid.transform;
-                ClearLocalTransform(newTemplate.transform);
+                ResetLocalTransform(newTemplate.transform);
 
                 //gameObjList.Add(newTemplate);
             }

Assets/CosmosEngine/Scripts/BaseModules/UI/CUIController.cs

@@ -196,7 +196,7 @@ static public uint LowInt(ulong l)
 
     public static string HumanizeTimeString(int seconds)
     {
-        TimeSpan ts = new TimeSpan(0, 0, seconds);
+        TimeSpan ts = TimeSpan.FromSeconds(seconds);
         string timeStr = string.Format("{0}{1}{2}{3}",
             ts.Days == 0 ? "" : ts.Days + "天",
             ts.Hours == 0 ? "" : ts.Hours + "小时",
@@ -221,16 +221,26 @@ public static DateTime GetDateTime(double unixTimeStamp)
         DateTime origin = new DateTime(1970, 1, 1, 0, 0, 0, 0);
         return origin.AddSeconds(unixTimeStamp);
     }
+    /// <summary>
+    /// Unix時間總毫秒數
+    /// </summary>
+    /// <returns></returns>
+    public static double GetUTCMilliseconds()
+    {
+        DateTime origin = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+        TimeSpan diff = DateTime.UtcNow - origin;
+        return diff.TotalMilliseconds;
+    }
 
     /// <summary>
     /// Unix時間總秒數
     /// </summary>
     /// <returns></returns>
-    public static uint GetUnixSeconds()
+    public static double GetUTCSeconds()
     {
         DateTime origin = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-        TimeSpan diff = DateTime.Now - origin;
-        return (uint)diff.TotalSeconds;
+        TimeSpan diff = DateTime.UtcNow - origin;
+        return diff.TotalSeconds;
     }
 
     public static UInt64 GetTimeEx()
@@ -332,6 +342,22 @@ public static string[] Match(string find, string pattern)
         return result;
     }
 
+    /// <summary>
+    /// Recursively set the game object's layer.
+    /// </summary>
+    static public void SetLayer(GameObject go, int layer)
+    {
+        go.layer = layer;
+
+        var t = go.transform;
+
+        for (int i = 0, imax = t.childCount; i < imax; ++i)
+        {
+            var child = t.GetChild(i);
+            SetLayer(child.gameObject, layer);
+        }
+    }
+
     public static void SetChild(GameObject child, GameObject parent)
     {
         SetChild(child.transform, parent.transform);