4340 【前端】支持xlua方便IOS提审"

client_Wu Xijin

2018-10-31 29104ef4a7661bf5834a7f7d36a49964381491b6

4340 【前端】支持xlua方便IOS提审"

 Core/ResModule/BuiltInLoader.cs

@@ -91,7 +91,7 @@
    public static T LoadScriptableObject<T>(string name) where T : ScriptableObject
    {

        T config;
        T config = null;
        if (AssetSource.builtInFromEditor)
        {
#if UNITY_EDITOR

 Lua/LuaBehaviour.cs

@@ -92,11 +92,4 @@
        table.Dispose();
    }

#if UNITY_EDITOR
    [ContextMenu("LuaReload")]
    public void ReLoadLua()
    {
        LuaUtility.DoString(fileName, "LuaBehaviour", table);
    }
#endif
}

 Lua/LuaGenEx.cs

@@ -57,6 +57,7 @@
    public static List<List<string>> BlackList = new List<List<string>>()  {
                new List<string>(){"System.Xml.XmlNodeList", "ItemOf"},
                new List<string>(){"UnityEngine.WWW", "movie"},
                new List<string>(){ "UnityEngine.UI.Text","OnRebuildRequested"},
    #if UNITY_WEBGL
                new List<string>(){"UnityEngine.WWW", "threadPriority"},
    #endif

 Lua/LuaWindow.cs

@@ -140,21 +140,4 @@
        }
    }

#if UNITY_EDITOR
    [ContextMenu("LuaReload")]
    public void ReLoadLua()
    {
        LuaUtility.Do(filePath, this.gameObject.name, table);

        if (onBindController != null)
        {
            onBindController();
        }

        if (onAddListeners != null)
        {
            onAddListeners();
        }
    }
#endif
}

 UI/Effect/UIEffect.cs

@@ -199,11 +199,12 @@
            return RetrospectWindow(parent.parent);

        }

    }

#if UNITY_EDITOR



    private const string EDITOR_EFFECT_PATH = "Assets/ResourcesOut/Effect/UI/";

    private const string EFFECT_EXTENAL = ".prefab";

    public void Preview(string _name)

    {

#if UNITY_EDITOR

        if (target != null)

        {

            DestroyImmediate(target);

@@ -222,8 +223,9 @@
        target.transform.localEulerAngles = Vector3.zero;

        target.transform.localScale = Vector3.one;

        Selection.activeGameObject = target.gameObject;

    }

#endif

    }



}

#if UNITY_EDITOR

[CustomEditor(typeof(UIEffect))]