xiyou_yueNanZhengshi
zhangjiannan 2024-12-31 11:49:32 +08:00
parent b3db6eb507
commit 0dbf174870
7 changed files with 257 additions and 124 deletions

View File

@ -704,9 +704,9 @@ RectTransform:
m_Father: {fileID: 1415383307548408226}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 695, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 695, y: -50}
m_SizeDelta: {x: 0, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8552513486474370558
@ -1141,9 +1141,9 @@ RectTransform:
m_Father: {fileID: 1415383307548408226}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 480, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 480, y: -50}
m_SizeDelta: {x: 0, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &282263520566598444
@ -1314,7 +1314,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 232.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8866466603871563102
@ -1483,7 +1483,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 587.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6023902533507475951
@ -8127,7 +8127,7 @@ ParticleSystem:
--- !u!199 &8490762427165167817
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -12960,7 +12960,7 @@ ParticleSystem:
--- !u!199 &8490762427297531630
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -18461,7 +18461,7 @@ ParticleSystem:
--- !u!199 &8490762427821104763
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23445,7 +23445,7 @@ ParticleSystem:
--- !u!199 &8490762428035569255
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28236,7 +28236,7 @@ ParticleSystem:
--- !u!199 &8490762428074860618
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33175,7 +33175,7 @@ ParticleSystem:
--- !u!199 &8490762428351855326
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38002,7 +38002,7 @@ ParticleSystem:
--- !u!199 &8490762428588085446
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42864,7 +42864,7 @@ ParticleSystem:
--- !u!199 &8490762428872251531
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -47976,7 +47976,7 @@ ParticleSystem:
--- !u!199 &8490762429003853987
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -125,6 +125,7 @@ namespace GameLogic {
{
path = AppConst.StreamPath + updateFilePath;
}
MEncyptUtil.LoadAssetBundle(AppConst.StreamPath + "lz4/fonts/hy-sayeez.unity3d", AppConst.EncyptKey, AppConst.EncyptBytesLength);
bundle = MEncyptUtil.LoadAssetBundle(path, AppConst.EncyptKey, AppConst.EncyptBytesLength);
if (bundle == null)
{

View File

@ -71,6 +71,7 @@ public class DelegateFactory
dict.Add(typeof(UnityEngine.Application.AdvertisingIdentifierCallback), factory.UnityEngine_Application_AdvertisingIdentifierCallback);
dict.Add(typeof(UnityEngine.Application.LowMemoryCallback), factory.UnityEngine_Application_LowMemoryCallback);
dict.Add(typeof(UnityEngine.Application.LogCallback), factory.UnityEngine_Application_LogCallback);
dict.Add(typeof(System.Action<bool>), factory.System_Action_bool);
dict.Add(typeof(System.Func<bool>), factory.System_Func_bool);
dict.Add(typeof(UnityEngine.AudioClip.PCMReaderCallback), factory.UnityEngine_AudioClip_PCMReaderCallback);
dict.Add(typeof(UnityEngine.AudioClip.PCMSetPositionCallback), factory.UnityEngine_AudioClip_PCMSetPositionCallback);
@ -158,6 +159,7 @@ public class DelegateFactory
DelegateTraits<UnityEngine.Application.AdvertisingIdentifierCallback>.Init(factory.UnityEngine_Application_AdvertisingIdentifierCallback);
DelegateTraits<UnityEngine.Application.LowMemoryCallback>.Init(factory.UnityEngine_Application_LowMemoryCallback);
DelegateTraits<UnityEngine.Application.LogCallback>.Init(factory.UnityEngine_Application_LogCallback);
DelegateTraits<System.Action<bool>>.Init(factory.System_Action_bool);
DelegateTraits<System.Func<bool>>.Init(factory.System_Func_bool);
DelegateTraits<UnityEngine.AudioClip.PCMReaderCallback>.Init(factory.UnityEngine_AudioClip_PCMReaderCallback);
DelegateTraits<UnityEngine.AudioClip.PCMSetPositionCallback>.Init(factory.UnityEngine_AudioClip_PCMSetPositionCallback);
@ -245,6 +247,7 @@ public class DelegateFactory
TypeTraits<UnityEngine.Application.AdvertisingIdentifierCallback>.Init(factory.Check_UnityEngine_Application_AdvertisingIdentifierCallback);
TypeTraits<UnityEngine.Application.LowMemoryCallback>.Init(factory.Check_UnityEngine_Application_LowMemoryCallback);
TypeTraits<UnityEngine.Application.LogCallback>.Init(factory.Check_UnityEngine_Application_LogCallback);
TypeTraits<System.Action<bool>>.Init(factory.Check_System_Action_bool);
TypeTraits<System.Func<bool>>.Init(factory.Check_System_Func_bool);
TypeTraits<UnityEngine.AudioClip.PCMReaderCallback>.Init(factory.Check_UnityEngine_AudioClip_PCMReaderCallback);
TypeTraits<UnityEngine.AudioClip.PCMSetPositionCallback>.Init(factory.Check_UnityEngine_AudioClip_PCMSetPositionCallback);
@ -332,6 +335,7 @@ public class DelegateFactory
StackTraits<UnityEngine.Application.AdvertisingIdentifierCallback>.Push = factory.Push_UnityEngine_Application_AdvertisingIdentifierCallback;
StackTraits<UnityEngine.Application.LowMemoryCallback>.Push = factory.Push_UnityEngine_Application_LowMemoryCallback;
StackTraits<UnityEngine.Application.LogCallback>.Push = factory.Push_UnityEngine_Application_LogCallback;
StackTraits<System.Action<bool>>.Push = factory.Push_System_Action_bool;
StackTraits<System.Func<bool>>.Push = factory.Push_System_Func_bool;
StackTraits<UnityEngine.AudioClip.PCMReaderCallback>.Push = factory.Push_UnityEngine_AudioClip_PCMReaderCallback;
StackTraits<UnityEngine.AudioClip.PCMSetPositionCallback>.Push = factory.Push_UnityEngine_AudioClip_PCMSetPositionCallback;
@ -3603,6 +3607,63 @@ public class DelegateFactory
ToLua.Push(L, o);
}
class System_Action_bool_Event : LuaDelegate
{
public System_Action_bool_Event(LuaFunction func) : base(func) { }
public System_Action_bool_Event(LuaFunction func, LuaTable self) : base(func, self) { }
public void Call(bool param0)
{
func.BeginPCall();
func.Push(param0);
func.PCall();
func.EndPCall();
}
public void CallWithSelf(bool param0)
{
func.BeginPCall();
func.Push(self);
func.Push(param0);
func.PCall();
func.EndPCall();
}
}
public System.Action<bool> System_Action_bool(LuaFunction func, LuaTable self, bool flag)
{
if (func == null)
{
System.Action<bool> fn = delegate(bool param0) { };
return fn;
}
if(!flag)
{
System_Action_bool_Event target = new System_Action_bool_Event(func);
System.Action<bool> d = target.Call;
target.method = d.Method;
return d;
}
else
{
System_Action_bool_Event target = new System_Action_bool_Event(func, self);
System.Action<bool> d = target.CallWithSelf;
target.method = d.Method;
return d;
}
}
bool Check_System_Action_bool(IntPtr L, int pos)
{
return TypeChecker.CheckDelegateType(typeof(System.Action<bool>), L, pos);
}
void Push_System_Action_bool(IntPtr L, System.Action<bool> o)
{
ToLua.Push(L, o);
}
class System_Func_bool_Event : LuaDelegate
{
public System_Func_bool_Event(LuaFunction func) : base(func) { }

View File

@ -400,6 +400,7 @@ public static class LuaBinder
L.RegFunction("Action_int", System_Action_int);
L.RegFunction("Comparison_int", System_Comparison_int);
L.RegFunction("Func_int_int", System_Func_int_int);
L.RegFunction("Action_bool", System_Action_bool);
L.RegFunction("Func_bool", System_Func_bool);
L.RegFunction("Action_UnityEngine_AsyncOperation", System_Action_UnityEngine_AsyncOperation);
L.RegFunction("Action_string", System_Action_string);
@ -2559,6 +2560,33 @@ public static class LuaBinder
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int System_Action_bool(IntPtr L)
{
try
{
int count = LuaDLL.lua_gettop(L);
LuaFunction func = ToLua.CheckLuaFunction(L, 1);
if (count == 1)
{
Delegate arg1 = DelegateTraits<System.Action<bool>>.Create(func);
ToLua.Push(L, arg1);
}
else
{
LuaTable self = ToLua.CheckLuaTable(L, 2);
Delegate arg1 = DelegateTraits<System.Action<bool>>.Create(func, self);
ToLua.Push(L, arg1);
}
return 1;
}
catch(Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int System_Func_bool(IntPtr L)
{

View File

@ -54,6 +54,7 @@ public class UnityEngine_ApplicationWrap
L.RegVar("logMessageReceived", get_logMessageReceived, set_logMessageReceived);
L.RegVar("logMessageReceivedThreaded", get_logMessageReceivedThreaded, set_logMessageReceivedThreaded);
L.RegVar("onBeforeRender", get_onBeforeRender, set_onBeforeRender);
L.RegVar("focusChanged", get_focusChanged, set_focusChanged);
L.RegVar("wantsToQuit", get_wantsToQuit, set_wantsToQuit);
L.RegVar("quitting", get_quitting, set_quitting);
L.RegFunction("AdvertisingIdentifierCallback", UnityEngine_Application_AdvertisingIdentifierCallback);
@ -752,6 +753,13 @@ public class UnityEngine_ApplicationWrap
return 1;
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int get_focusChanged(IntPtr L)
{
ToLua.Push(L, new EventObject(typeof(System.Action<bool>)));
return 1;
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int get_wantsToQuit(IntPtr L)
{
@ -951,6 +959,41 @@ public class UnityEngine_ApplicationWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int set_focusChanged(IntPtr L)
{
try
{
EventObject arg0 = null;
if (LuaDLL.lua_isuserdata(L, 2) != 0)
{
arg0 = (EventObject)ToLua.ToObject(L, 2);
}
else
{
return LuaDLL.luaL_throw(L, "The event 'UnityEngine.Application.focusChanged' can only appear on the left hand side of += or -= when used outside of the type 'UnityEngine.Application'");
}
if (arg0.op == EventOp.Add)
{
System.Action<bool> ev = (System.Action<bool>)arg0.func;
UnityEngine.Application.focusChanged += ev;
}
else if (arg0.op == EventOp.Sub)
{
System.Action<bool> ev = (System.Action<bool>)arg0.func;
UnityEngine.Application.focusChanged -= ev;
}
return 0;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int set_wantsToQuit(IntPtr L)
{

View File

@ -281,6 +281,60 @@ public class System_DelegateWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int Destroy(IntPtr L)
{
Delegate arg0 = (Delegate)ToLua.CheckObject<Delegate>(L, 1);
Delegate[] ds = arg0.GetInvocationList();
for (int i = 0; i < ds.Length; i++)
{
LuaDelegate ld = ds[i].Target as LuaDelegate;
if (ld != null)
{
ld.Dispose();
}
}
return 0;
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetHashCode(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
System.Delegate obj = (System.Delegate)ToLua.CheckObject<System.Delegate>(L, 1);
int o = obj.GetHashCode();
LuaDLL.lua_pushinteger(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int Equals(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 2);
System.Delegate obj = (System.Delegate)ToLua.CheckObject<System.Delegate>(L, 1);
object arg0 = ToLua.ToVarObject(L, 2);
bool o = obj != null ? obj.Equals(arg0) : arg0 == null;
LuaDLL.lua_pushboolean(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int op_Subtraction(IntPtr L)
{
@ -380,60 +434,6 @@ public class System_DelegateWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int Destroy(IntPtr L)
{
Delegate arg0 = (Delegate)ToLua.CheckObject<Delegate>(L, 1);
Delegate[] ds = arg0.GetInvocationList();
for (int i = 0; i < ds.Length; i++)
{
LuaDelegate ld = ds[i].Target as LuaDelegate;
if (ld != null)
{
ld.Dispose();
}
}
return 0;
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetHashCode(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
System.Delegate obj = (System.Delegate)ToLua.CheckObject<System.Delegate>(L, 1);
int o = obj.GetHashCode();
LuaDLL.lua_pushinteger(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int Equals(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 2);
System.Delegate obj = (System.Delegate)ToLua.CheckObject<System.Delegate>(L, 1);
object arg0 = ToLua.ToVarObject(L, 2);
bool o = obj != null ? obj.Equals(arg0) : arg0 == null;
LuaDLL.lua_pushboolean(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int get_Method(IntPtr L)
{

View File

@ -7,13 +7,13 @@ public class UnityEngine_ObjectWrap
public static void Register(LuaState L)
{
L.BeginClass(typeof(UnityEngine.Object), typeof(System.Object));
L.RegFunction("FindObjectsOfType", FindObjectsOfType);
L.RegFunction("DontDestroyOnLoad", DontDestroyOnLoad);
L.RegFunction("ToString", ToString);
L.RegFunction("GetInstanceID", GetInstanceID);
L.RegFunction("GetHashCode", GetHashCode);
L.RegFunction("Equals", Equals);
L.RegFunction("FindObjectsOfType", FindObjectsOfType);
L.RegFunction("DontDestroyOnLoad", DontDestroyOnLoad);
L.RegFunction("FindObjectOfType", FindObjectOfType);
L.RegFunction("ToString", ToString);
L.RegFunction("Instantiate", Instantiate);
L.RegFunction("DestroyImmediate", DestroyImmediate);
L.RegFunction("Destroy", Destroy);
@ -49,56 +49,6 @@ public class UnityEngine_ObjectWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int FindObjectsOfType(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
System.Type arg0 = ToLua.CheckMonoType(L, 1);
UnityEngine.Object[] o = UnityEngine.Object.FindObjectsOfType(arg0);
ToLua.Push(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int DontDestroyOnLoad(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
UnityEngine.Object arg0 = (UnityEngine.Object)ToLua.CheckObject<UnityEngine.Object>(L, 1);
UnityEngine.Object.DontDestroyOnLoad(arg0);
return 0;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int ToString(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
UnityEngine.Object obj = (UnityEngine.Object)ToLua.CheckObject<UnityEngine.Object>(L, 1);
string o = obj.ToString();
LuaDLL.lua_pushstring(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int GetInstanceID(IntPtr L)
{
@ -151,6 +101,39 @@ public class UnityEngine_ObjectWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int FindObjectsOfType(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
System.Type arg0 = ToLua.CheckMonoType(L, 1);
UnityEngine.Object[] o = UnityEngine.Object.FindObjectsOfType(arg0);
ToLua.Push(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int DontDestroyOnLoad(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
UnityEngine.Object arg0 = (UnityEngine.Object)ToLua.CheckObject<UnityEngine.Object>(L, 1);
UnityEngine.Object.DontDestroyOnLoad(arg0);
return 0;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int FindObjectOfType(IntPtr L)
{
@ -168,6 +151,23 @@ public class UnityEngine_ObjectWrap
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int ToString(IntPtr L)
{
try
{
ToLua.CheckArgsCount(L, 1);
UnityEngine.Object obj = (UnityEngine.Object)ToLua.CheckObject<UnityEngine.Object>(L, 1);
string o = obj.ToString();
LuaDLL.lua_pushstring(L, o);
return 1;
}
catch (Exception e)
{
return LuaDLL.toluaL_exception(L, e);
}
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int op_Equality(IntPtr L)
{