diff --git a/Assets/Editor/LuaGenConfig.cs b/Assets/Editor/LuaGenConfig.cs
index 01385a828..9226a1930 100644
--- a/Assets/Editor/LuaGenConfig.cs
+++ b/Assets/Editor/LuaGenConfig.cs
@@ -367,6 +367,7 @@ namespace BFEditor
typeof(Spine.Unity.SkeletonRenderer),
typeof(Spine.Unity.SkeletonRenderer.SpriteMaskInteractionMaterials),
typeof(Spine.Unity.BoneFollower),
+ typeof(Spine.Unity.BoneFollowerGraphic),
typeof(Spine.Unity.BoneFollower.AxisOrientation),
// TextMeshPro
diff --git a/Assets/XLua/Gen/BF_BFLoginSDKManagerWrap.cs b/Assets/XLua/Gen/BF_BFLoginSDKManagerWrap.cs
index 92069b96c..97c1a9639 100644
--- a/Assets/XLua/Gen/BF_BFLoginSDKManagerWrap.cs
+++ b/Assets/XLua/Gen/BF_BFLoginSDKManagerWrap.cs
@@ -21,7 +21,7 @@ namespace XLua.CSObjectWrap
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(BF.BFLoginSDKManager);
- Utils.BeginObjectRegister(type, L, translator, 0, 30, 11, 10);
+ Utils.BeginObjectRegister(type, L, translator, 0, 30, 12, 11);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "InitListener", _m_InitListener);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetLuaLoginCallback", _m_SetLuaLoginCallback);
@@ -63,6 +63,7 @@ namespace XLua.CSObjectWrap
Utils.RegisterFunc(L, Utils.GETTER_IDX, "luaServerListCallback", _g_get_luaServerListCallback);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "luaAccountLoginCallback", _g_get_luaAccountLoginCallback);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "luaAccountChangeCallback", _g_get_luaAccountChangeCallback);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "FBSdk", _g_get_FBSdk);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "accountInfo", _g_get_accountInfo);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "firebaseToken", _g_get_firebaseToken);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "luaFirebaseTokenCallback", _g_get_luaFirebaseTokenCallback);
@@ -74,6 +75,7 @@ namespace XLua.CSObjectWrap
Utils.RegisterFunc(L, Utils.SETTER_IDX, "luaServerListCallback", _s_set_luaServerListCallback);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "luaAccountLoginCallback", _s_set_luaAccountLoginCallback);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "luaAccountChangeCallback", _s_set_luaAccountChangeCallback);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "FBSdk", _s_set_FBSdk);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "accountInfo", _s_set_accountInfo);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "firebaseToken", _s_set_firebaseToken);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "luaFirebaseTokenCallback", _s_set_luaFirebaseTokenCallback);
@@ -1094,6 +1096,20 @@ namespace XLua.CSObjectWrap
return 1;
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_FBSdk(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ BF.BFLoginSDKManager gen_to_be_invoked = (BF.BFLoginSDKManager)translator.FastGetCSObj(L, 1);
+ translator.Push(L, gen_to_be_invoked.FBSdk);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_accountInfo(RealStatePtr L)
{
@@ -1243,6 +1259,21 @@ namespace XLua.CSObjectWrap
return 0;
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_FBSdk(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ BF.BFLoginSDKManager gen_to_be_invoked = (BF.BFLoginSDKManager)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.FBSdk = (BF.NativeCore.ThirdPlatform.FacebookSdk)translator.GetObject(L, 2, typeof(BF.NativeCore.ThirdPlatform.FacebookSdk));
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _s_set_accountInfo(RealStatePtr L)
{
diff --git a/Assets/XLua/Gen/Spine_Unity_BoneFollowerGraphicWrap.cs b/Assets/XLua/Gen/Spine_Unity_BoneFollowerGraphicWrap.cs
new file mode 100644
index 000000000..79bb837dc
--- /dev/null
+++ b/Assets/XLua/Gen/Spine_Unity_BoneFollowerGraphicWrap.cs
@@ -0,0 +1,602 @@
+#if USE_UNI_LUA
+using LuaAPI = UniLua.Lua;
+using RealStatePtr = UniLua.ILuaState;
+using LuaCSFunction = UniLua.CSharpFunctionDelegate;
+#else
+using LuaAPI = XLua.LuaDLL.Lua;
+using RealStatePtr = System.IntPtr;
+using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
+#endif
+
+using XLua;
+using System.Collections.Generic;
+
+
+namespace XLua.CSObjectWrap
+{
+ using Utils = XLua.Utils;
+ public class SpineUnityBoneFollowerGraphicWrap
+ {
+ public static void __Register(RealStatePtr L)
+ {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+ System.Type type = typeof(Spine.Unity.BoneFollowerGraphic);
+ Utils.BeginObjectRegister(type, L, translator, 0, 4, 13, 13);
+
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetBone", _m_SetBone);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "Awake", _m_Awake);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "Initialize", _m_Initialize);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "LateUpdate", _m_LateUpdate);
+
+
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "SkeletonGraphic", _g_get_SkeletonGraphic);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "skeletonGraphic", _g_get_skeletonGraphic);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "initializeOnAwake", _g_get_initializeOnAwake);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "boneName", _g_get_boneName);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "followBoneRotation", _g_get_followBoneRotation);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "followSkeletonFlip", _g_get_followSkeletonFlip);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "followLocalScale", _g_get_followLocalScale);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "followParentWorldScale", _g_get_followParentWorldScale);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "followXYPosition", _g_get_followXYPosition);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "followZPosition", _g_get_followZPosition);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "maintainedAxisOrientation", _g_get_maintainedAxisOrientation);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "bone", _g_get_bone);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "valid", _g_get_valid);
+
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "SkeletonGraphic", _s_set_SkeletonGraphic);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "skeletonGraphic", _s_set_skeletonGraphic);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "initializeOnAwake", _s_set_initializeOnAwake);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "boneName", _s_set_boneName);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "followBoneRotation", _s_set_followBoneRotation);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "followSkeletonFlip", _s_set_followSkeletonFlip);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "followLocalScale", _s_set_followLocalScale);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "followParentWorldScale", _s_set_followParentWorldScale);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "followXYPosition", _s_set_followXYPosition);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "followZPosition", _s_set_followZPosition);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "maintainedAxisOrientation", _s_set_maintainedAxisOrientation);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "bone", _s_set_bone);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "valid", _s_set_valid);
+
+
+ Utils.EndObjectRegister(type, L, translator, null, null,
+ null, null, null);
+
+ Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0);
+
+
+
+
+
+
+ Utils.EndClassRegister(type, L, translator);
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int __CreateInstance(RealStatePtr L)
+ {
+
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+ if(LuaAPI.lua_gettop(L) == 1)
+ {
+
+ var gen_ret = new Spine.Unity.BoneFollowerGraphic();
+ translator.Push(L, gen_ret);
+
+ return 1;
+ }
+
+ }
+ catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return LuaAPI.luaL_error(L, "invalid arguments to Spine.Unity.BoneFollowerGraphic constructor!");
+
+ }
+
+
+
+
+
+
+
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_SetBone(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+ string _name = LuaAPI.lua_tostring(L, 2);
+
+ var gen_ret = gen_to_be_invoked.SetBone( _name );
+ LuaAPI.lua_pushboolean(L, gen_ret);
+
+
+
+ return 1;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_Awake(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+
+ gen_to_be_invoked.Awake( );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_Initialize(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+
+ gen_to_be_invoked.Initialize( );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_LateUpdate(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+
+ gen_to_be_invoked.LateUpdate( );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+
+
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_SkeletonGraphic(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ translator.Push(L, gen_to_be_invoked.SkeletonGraphic);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_skeletonGraphic(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ translator.Push(L, gen_to_be_invoked.skeletonGraphic);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_initializeOnAwake(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.initializeOnAwake);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_boneName(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushstring(L, gen_to_be_invoked.boneName);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_followBoneRotation(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.followBoneRotation);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_followSkeletonFlip(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.followSkeletonFlip);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_followLocalScale(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.followLocalScale);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_followParentWorldScale(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.followParentWorldScale);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_followXYPosition(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.followXYPosition);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_followZPosition(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.followZPosition);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_maintainedAxisOrientation(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ translator.PushSpineUnityBoneFollowerAxisOrientation(L, gen_to_be_invoked.maintainedAxisOrientation);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_bone(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ translator.Push(L, gen_to_be_invoked.bone);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_valid(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.valid);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_SkeletonGraphic(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.SkeletonGraphic = (Spine.Unity.SkeletonGraphic)translator.GetObject(L, 2, typeof(Spine.Unity.SkeletonGraphic));
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_skeletonGraphic(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.skeletonGraphic = (Spine.Unity.SkeletonGraphic)translator.GetObject(L, 2, typeof(Spine.Unity.SkeletonGraphic));
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_initializeOnAwake(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.initializeOnAwake = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_boneName(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.boneName = LuaAPI.lua_tostring(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_followBoneRotation(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.followBoneRotation = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_followSkeletonFlip(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.followSkeletonFlip = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_followLocalScale(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.followLocalScale = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_followParentWorldScale(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.followParentWorldScale = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_followXYPosition(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.followXYPosition = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_followZPosition(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.followZPosition = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_maintainedAxisOrientation(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ Spine.Unity.BoneFollower.AxisOrientation gen_value;translator.Get(L, 2, out gen_value);
+ gen_to_be_invoked.maintainedAxisOrientation = gen_value;
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_bone(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.bone = (Spine.Bone)translator.GetObject(L, 2, typeof(Spine.Bone));
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_valid(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Spine.Unity.BoneFollowerGraphic gen_to_be_invoked = (Spine.Unity.BoneFollowerGraphic)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.valid = LuaAPI.lua_toboolean(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+
+
+
+
+ }
+}
diff --git a/Assets/XLua/Gen/XLuaGenAutoRegister.cs b/Assets/XLua/Gen/XLuaGenAutoRegister.cs
index c5d7863f3..2281e1cfa 100644
--- a/Assets/XLua/Gen/XLuaGenAutoRegister.cs
+++ b/Assets/XLua/Gen/XLuaGenAutoRegister.cs
@@ -3014,6 +3014,9 @@ namespace XLua.CSObjectWrap
translator.DelayWrapLoader(typeof(Spine.Unity.BoneFollower), SpineUnityBoneFollowerWrap.__Register);
+ translator.DelayWrapLoader(typeof(Spine.Unity.BoneFollowerGraphic), SpineUnityBoneFollowerGraphicWrap.__Register);
+
+
translator.DelayWrapLoader(typeof(Spine.Unity.BoneFollower.AxisOrientation), SpineUnityBoneFollowerAxisOrientationWrap.__Register);
diff --git a/Assets/XLua/Gen/link.xml b/Assets/XLua/Gen/link.xml
index 1f5c6a681..403ce35d6 100644
--- a/Assets/XLua/Gen/link.xml
+++ b/Assets/XLua/Gen/link.xml
@@ -1156,6 +1156,7 @@
+
diff --git a/Assets/arts/effects/texture/glow/eff_sy_002_huang.png.meta b/Assets/arts/effects/texture/glow/eff_sy_002_huang.png.meta
index 25fbf417b..1fb3ab8b2 100644
--- a/Assets/arts/effects/texture/glow/eff_sy_002_huang.png.meta
+++ b/Assets/arts/effects/texture/glow/eff_sy_002_huang.png.meta
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 236026ab11c1ea14b83e8ee8e8920ee6
TextureImporter:
- fileIDToRecycleName: {}
+ internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 9
+ serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
+ vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -31,12 +32,12 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: -1
- wrapV: -1
- wrapW: -1
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
@@ -54,11 +55,15 @@ TextureImporter:
textureType: 0
textureShape: 1
singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 1
platformSettings:
- - serializedVersion: 2
+ - serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -69,7 +74,8 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -80,6 +86,31 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 47
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -87,10 +118,12 @@ TextureImporter:
physicsShape: []
bones: []
spriteID:
+ internalID: 0
vertices: []
indices:
edges: []
weights: []
+ secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/arts/effects/texture/smoke/smoke_025_cla.png.meta b/Assets/arts/effects/texture/smoke/smoke_025_cla.png.meta
index 83093681c..e7fc79c32 100644
--- a/Assets/arts/effects/texture/smoke/smoke_025_cla.png.meta
+++ b/Assets/arts/effects/texture/smoke/smoke_025_cla.png.meta
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 8c7f12545a5ea424e8e7b53bad0374a2
TextureImporter:
- fileIDToRecycleName: {}
+ internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 9
+ serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
+ vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -31,9 +32,9 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
@@ -54,11 +55,15 @@ TextureImporter:
textureType: 0
textureShape: 1
singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 1
platformSettings:
- - serializedVersion: 2
+ - serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -69,7 +74,8 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
@@ -80,17 +86,31 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- - serializedVersion: 2
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
- textureCompression: 1
+ textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -98,10 +118,12 @@ TextureImporter:
physicsShape: []
bones: []
spriteID:
+ internalID: 0
vertices: []
indices:
edges: []
weights: []
+ secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0