Merge branch 'slua-1.1.1'

Assets/Game/Scripts/Base/YwDebug.cs

@@ -11,10 +11,8 @@
 using System;
 using UnityEngine;
 using System.Collections.Generic;
-using SLua;
 
 // The extend debug library.
-[CustomLuaClass]
 public class YwDebug
 {
     /**

Assets/Game/Scripts/Base/YwDontDestroyOnLoad.cs

@@ -0,0 +1,22 @@
+/**
+ * The do not destroy on load script.
+ *
+ * @filename  YwDontDestroyOnLoad.cs
+ * @copyright Copyright (c) 2015 Yaukey/yaukeywang/WangYaoqi ([email protected]) all rights reserved.
+ * @license   The MIT License (MIT)
+ * @author    Yaukey
+ * @date      2016-01-24
+ */
+
+using UnityEngine;
+using System.Collections;
+
+// The do not destroy on load script.
+public class YwDontDestroyOnLoad : MonoBehaviour
+{
+	// Use this for initialization
+	void Awake()
+    {
+        DontDestroyOnLoad(gameObject);
+	}
+}

Assets/Game/Scripts/Base/YwGlobal.cs

@@ -14,6 +14,15 @@
 // The global object that not be destroyed.
 public class YwGlobal : MonoBehaviour
 {
+    // The lite update fps.
+    public int m_liteUpdateFps = 10;
+
+    // The lite upate flag.
+    private bool m_bLiteUpdate = true;
+
+    // The lite update timer.
+    private WaitForSeconds m_cLiteUpdateTimer = null;
+
     // The instance.
     private static YwGlobal m_cInstance = null;
 
@@ -44,19 +53,77 @@ void Awake()
     }
 
     // Start to init.
-    void Start()
+    IEnumerator Start()
     {
+        // Wait the script environment init ok.
+        while (!YwLuaScriptMng.Instance.Initialized)
+        {
+            yield return null;
+        }
+
+        // Init lite update settings.
+        m_cLiteUpdateTimer = new WaitForSeconds(1.0f / (float)m_liteUpdateFps);
+        StartCoroutine(LiteUpdateControler());
     }
 
-    // Update is called once per frame
+    // Update is called once per frame.
     void Update()
     {
+        // Check if init ok.
+        if (!YwLuaScriptMng.Instance.Initialized)
+        {
+            return;
+        }
+
+        // The main update.
         YwLuaScriptMng.Instance.Update();
+
+        // The lite update.
+        if (m_bLiteUpdate)
+        {
+            m_bLiteUpdate = false;
+            YwLuaScriptMng.Instance.LiteUpdate();
+        }
     }
 
+    // LateUpdate is called every frame.
+    void LateUpdate()
+    {
+        // Check if init ok.
+        if (!YwLuaScriptMng.Instance.Initialized)
+        {
+            return;
+        }
+
+        YwLuaScriptMng.Instance.LateUpdate();
+    }
+
+    // FixedUpdate is called every fixed framerate frame.
+    void FixedUpdate()
+    {
+        // Check if init ok.
+        if (!YwLuaScriptMng.Instance.Initialized)
+        {
+            return;
+        }
+
+        YwLuaScriptMng.Instance.FixedUpdate();
+    }
+
+    // Init the global lua script manager.
     private void InitGlobalManager()
     {
         // The base support.
         YwLuaScriptMng.Instance.Initialize();
     }
+
+    // The coroutine to control lite update.
+    private IEnumerator LiteUpdateControler()
+    {
+        while (true)
+        {
+            m_bLiteUpdate = true;
+            yield return m_cLiteUpdateTimer;
+        }
+    }
 }