Merge branch 'LuaParamsPropertyDrawer'

Assets/Game/Scripts/Base/YwLuaMonoBehaviour.cs

@@ -13,9 +13,10 @@
 using System.Collections.Generic;
 using SLua;
 
-// The lua mono behaviour class.
-public class YwLuaMonoBehaviour : YwLuaMonoBehaviourBase
-{
+// The params of class YwLuaMonoBehaviour.
+[System.Serializable]
+public class YwLuaMonoBehaviourParams
+{
     // The mono method types.
     public enum EMonoMethod
     {
@@ -36,19 +37,27 @@ public enum EMonoMethod
         OnCollisionExit,
         OnCollisionExit2D,
         // Add more if your need.
-    }
-
+    }
+
     // The lua class name.
-    public string m_className = string.Empty;
+    public string m_strLuaClassName = string.Empty;
 
     // All mono method we have.
-    public List<EMonoMethod> m_monoMethods = new List<EMonoMethod>();
+    public List<EMonoMethod> m_cMonoMethods = new List<EMonoMethod>();
 
     // The parameters used to pass to lua.
-    public GameObject[] m_parameters = null;
+    public GameObject[] m_aParameters = null;
+}
+
+// The lua mono behaviour class.
+public class YwLuaMonoBehaviour : YwLuaMonoBehaviourBase
+{
+    // The mono behaviour params to lua.
+    [DoNotToLua]
+    public YwLuaMonoBehaviourParams m_luaParameters = new YwLuaMonoBehaviourParams();
 
     // The static method array.
-    private bool[] m_aMonoMethodFlags = new bool[System.Enum.GetValues(typeof(EMonoMethod)).Length];
+    private bool[] m_aMonoMethodFlags = new bool[System.Enum.GetValues(typeof(YwLuaMonoBehaviourParams.EMonoMethod)).Length];
 
     // Name of enable base lua function.
     private static readonly string LUA_FUNC_NAME_ON_ENABLE_BASE = "OnEnableBase";
@@ -71,32 +80,28 @@ void Awake()
         }
 
         // Directly create a lua class instance to associate with this monobehavior.
-        if (string.IsNullOrEmpty(m_className) || !CreateClassInstance(m_className))
+        if (string.IsNullOrEmpty(m_luaParameters.m_strLuaClassName) || !CreateClassInstance(m_luaParameters.m_strLuaClassName))
         {
             return;
         }
 
         // Initialize parameters need to be passed to lua.
-        if ((null != m_parameters) && (m_parameters.Length > 0))
+        if ((null != m_luaParameters.m_aParameters) && (m_luaParameters.m_aParameters.Length > 0))
         {
-            m_cBehavior.SetData("m_aParameters", m_parameters);
+            m_cBehavior.SetData("m_aParameters", m_luaParameters.m_aParameters);
         }
 
         // Init all method flags.
         for (int i = 0; i < m_aMonoMethodFlags.Length; i++)
         {
-            m_aMonoMethodFlags[i] = m_monoMethods.Contains((EMonoMethod)i);
+            m_aMonoMethodFlags[i] = m_luaParameters.m_cMonoMethods.Contains((YwLuaMonoBehaviourParams.EMonoMethod)i);
         }
 
-        // Clear method list.
-        m_monoMethods.Clear();
-        m_monoMethods = null;
-
         // Init update flags.
-        m_cBehavior.SetData("m_bUpdate", m_aMonoMethodFlags[(int)EMonoMethod.Update]);
-        m_cBehavior.SetData("m_bLateUpdate", m_aMonoMethodFlags[(int)EMonoMethod.LateUpdate]);
-        m_cBehavior.SetData("m_bFixedUpdate", m_aMonoMethodFlags[(int)EMonoMethod.FixedUpdate]);
-        m_cBehavior.SetData("m_bLiteUpdate", m_aMonoMethodFlags[(int)EMonoMethod.LiteUpdate]);
+        m_cBehavior.SetData("m_bUpdate", m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.Update]);
+        m_cBehavior.SetData("m_bLateUpdate", m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.LateUpdate]);
+        m_cBehavior.SetData("m_bFixedUpdate", m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.FixedUpdate]);
+        m_cBehavior.SetData("m_bLiteUpdate", m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.LiteUpdate]);
 
         // To set custom parameters need to be passed to lua.
         OnSetCustomParameters();
@@ -112,7 +117,7 @@ void Awake()
 	// Use this for initialization.
 	void Start()
     {
-	    if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.Start])
+	    if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.Start])
         {
             return;
         }
@@ -132,7 +137,7 @@ void OnEnable()
         m_cBehavior.CallMethod(ref m_cOnEnableBase, LUA_FUNC_NAME_ON_ENABLE_BASE, m_cBehavior.GetChunk());
 
         // Call enable.
-        if (m_aMonoMethodFlags[(int)EMonoMethod.OnEnable])
+        if (m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnEnable])
         {
             m_cBehavior.OnEnable();
         }
@@ -150,7 +155,7 @@ void OnDisable()
         m_cBehavior.CallMethod(ref m_cOnDisableBase, LUA_FUNC_NAME_ON_DISENABLE_BASE, m_cBehavior.GetChunk());
 
         // Call disable.
-        if (m_aMonoMethodFlags[(int)EMonoMethod.OnDisable])
+        if (m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnDisable])
         {
             m_cBehavior.OnDisable();
         }
@@ -169,7 +174,7 @@ void OnDestroy()
         m_cBehavior.CallMethod(ref cOnDestroyBase, "OnDestroyBase", m_cBehavior.GetChunk());
 
         // Call on destroy.
-        if (m_aMonoMethodFlags[(int)EMonoMethod.OnDestroy])
+        if (m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnDestroy])
         {
             m_cBehavior.OnDestroy();
         }
@@ -178,7 +183,7 @@ void OnDestroy()
     // OnTriggerEnter is called when the Collider other enters the trigger.
     void OnTriggerEnter(Collider cOther)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnTriggerEnter])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnTriggerEnter])
         {
             return;
         }
@@ -189,7 +194,7 @@ void OnTriggerEnter(Collider cOther)
     // Sent when another object enters a trigger collider attached to this object (2D physics only).
     void OnTriggerEnter2D(Collider2D cOther)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnTriggerEnter2D])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnTriggerEnter2D])
         {
             return;
         }
@@ -200,7 +205,7 @@ void OnTriggerEnter2D(Collider2D cOther)
     // OnTriggerExit is called when the Collider other has stopped touching the trigger.
     void OnTriggerExit(Collider cOther)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnTriggerExit])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnTriggerExit])
         {
             return;
         }
@@ -211,7 +216,7 @@ void OnTriggerExit(Collider cOther)
     // Sent when another object leaves a trigger collider attached to this object (2D physics only).
     void OnTriggerExit2D(Collider2D cOther)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnTriggerExit2D])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnTriggerExit2D])
         {
             return;
         }
@@ -222,7 +227,7 @@ void OnTriggerExit2D(Collider2D cOther)
     // OnCollisionEnter is called when this collider/rigidbody has begun touching another rigidbody/collider.
     void OnCollisionEnter(Collision cCollision)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnCollisionEnter])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnCollisionEnter])
         {
             return;
         }
@@ -233,7 +238,7 @@ void OnCollisionEnter(Collision cCollision)
     // Sent when an incoming collider makes contact with this object's collider (2D physics only).
     void OnCollisionEnter2D(Collision2D cCollision)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnCollisionEnter2D])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnCollisionEnter2D])
         {
             return;
         }
@@ -244,7 +249,7 @@ void OnCollisionEnter2D(Collision2D cCollision)
     // OnCollisionExit is called when this collider/rigidbody has stopped touching another rigidbody/collider.
     void OnCollisionExit(Collision cCollision)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnCollisionExit])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnCollisionExit])
         {
             return;
         }
@@ -255,14 +260,25 @@ void OnCollisionExit(Collision cCollision)
     // Sent when a collider on another object stops touching this object's collider (2D physics only).
     void OnCollisionExit2D(Collision2D cCollision)
     {
-        if (!m_bReady || !m_aMonoMethodFlags[(int)EMonoMethod.OnCollisionExit2D])
+        if (!m_bReady || !m_aMonoMethodFlags[(int)YwLuaMonoBehaviourParams.EMonoMethod.OnCollisionExit2D])
         {
             return;
         }
 
         m_cBehavior.OnCollisionExit2D(cCollision);
     }
 
+    /**
+     * Get lua class name.
+     * 
+     * @param void.
+     * @return string - The name of the associated lua class.
+     */
+    public string GetLuaClassName()
+    {
+        return m_luaParameters.m_strLuaClassName;
+    }
+
     /**
      * To set custom parameters need to be passed to lua.
      * 

Assets/Game/Scripts/Editor/CustomExportTypeToLua.cs → Assets/Game/Scripts/Editor/LgCustomExportTypeToLua.cs

@@ -1,7 +1,7 @@
 /**
  * The custom export lua type class, this is editor class.
  *
- * @filename  CustomExportTypeToLua.cs
+ * @filename  LgCustomExportTypeToLua.cs
  * @copyright Copyright (c) 2015 Yaukey/yaukeywang/WangYaoqi ([email protected]) all rights reserved.
  * @license   The MIT License (MIT)
  * @author    Yaukey
@@ -14,7 +14,7 @@
 using SLua;
 
 // The custom export lua type class.
-public class CustomExportTypeToLua : ICustomExportPost
+public class LgCustomExportTypeToLua : ICustomExportPost
 {
     /**
      * Get custom assembly to generate extension method.

Assets/Game/Scripts/Editor/YwLuaMonoBehaviourEditor.cs

@@ -0,0 +1,47 @@
+/**
+ * The custom editor of the YwLuaMonoBehaviourEditor class.
+ *
+ * @filename  YwLuaMonoBehaviourEditor.cs
+ * @copyright Copyright (c) 2015 Yaukey/yaukeywang/WangYaoqi ([email protected]) all rights reserved.
+ * @license   The MIT License (MIT)
+ * @author    Yaukey
+ * @date      2016-03-25
+ */
+
+using UnityEngine;
+using UnityEditor;
+using System.Collections;
+using System;
+
+// The custom editor of the YwLuaMonoBehaviourEditor class.
+[CustomEditor(typeof(YwLuaMonoBehaviour), true)]
+public class YwLuaMonoBehaviourEditor : Editor
+{
+    // The lua params property.
+    protected SerializedProperty m_cLuaParams = null;
+
+    /**
+     * This function is called when the object is loaded.
+     * 
+     * @param void.
+     * @return void.
+     */
+    protected virtual void OnEnable()
+    {
+        m_cLuaParams = serializedObject.FindProperty("m_luaParameters");
+    }
+
+    /**
+     * Implement this function to make a custom inspector.
+     * Inside this function you can add your own custom GUI for the inspector of a specific object class.
+     * 
+     * @param void.
+     * @return void.
+     */
+    public override void OnInspectorGUI()
+    {
+        serializedObject.Update();
+        EditorGUILayout.PropertyField(m_cLuaParams);
+        serializedObject.ApplyModifiedProperties();
+    }
+}