Skip to content

Commit f43b882

Browse files
kisence-miankisence-mian
committed
劣化ToLua以支持v3
1 parent a4bcfa3 commit f43b882

86 files changed

Lines changed: 3995 additions & 241 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/EditorConfig/BundleConfigEditor.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Assets/Resources/Config/LuaConfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"MainLua":"{\"m_type\":0,\"m_content\":\"TestLua\",\"m_enumType\":\"\"}","LuaList":"{\"m_type\":8,\"m_content\":\"luaMain|LuaLuaTestWindow|LuaTest2Window\",\"m_enumType\":\"AnimType\"}","LuaLibList":"{\"m_type\":0,\"m_content\":\"LuaDataHelper|LuaEventDispatcher|luaJson|LuaPrintTable|LuaUIManager|LuaUIWindowMetatable|LuaFrameWorkEventName|LuaDataHelper|LuaStatusManager|LuaStatusMetaTable|LuaUIManager|LuaUIWindowMetatable|LuaUpdate\",\"m_enumType\":\"\"}"}
1+
{"MainLua":"{\"m_type\":0,\"m_content\":\"TestLua\",\"m_enumType\":\"\"}","LuaList":"{\"m_type\":8,\"m_content\":\"luaMain|LuaLuaTestWindow|LuaTest2Window\",\"m_enumType\":\"AnimType\"}","LuaLibList":"{\"m_type\":0,\"m_content\":\"LuaDataHelper|LuaEventDispatcher|luaJson|LuaPrintTable|LuaUIManager|LuaUIWindowMetatable|LuaFrameWorkEventName|LuaDataHelper|LuaStatusManager|LuaStatusMetaTable|LuaUIManager|LuaUIWindowMetatable|LuaUpdate|LuaUnityDefine\",\"m_enumType\":\"\"}"}

‎Assets/Resources/Lua/UI/LuaLuaTestWindow.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ end
1313

1414
function LuaTestWindow:OnOpen()
1515

16+
AnimSystem.UguiMove(self.UIWindow_ui:GetGameObject("Button"),Vector3.New(0,0,0),Vector3.New(0,100,0),2,0,InterpType.Default,false,RepeatType.PingPang,-1,nil,nil);
17+
1618
end
1719

1820
function LuaTestWindow.OnClick(UIEvent_e,T_2)

‎Assets/Resources/LuaLib/Unity.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/LuaLib/Unity/LuaUnityDefine.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Vector4 = UnityEngine.Vector4
2+
Vector3 = UnityEngine.Vector3
3+
Vector2 = UnityEngine.Vector2
4+
5+
Color = UnityEngine.Color

‎Assets/Resources/LuaLib/Unity/LuaUnityDefine.txt.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/ResourcesManifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"relyBundles":{},"AssetsBundles":{"111":{"name":"111","path":"Config/111","relyPackages":"","md5":"7228da7250d357ec26e8755abdbd652"},"BundleConfig":{"name":"BundleConfig","path":"Config/BundleConfig","relyPackages":"","md5":"badc9c9de1319dc2b858eb54d4f843b"},"HotUpdateConfig":{"name":"HotUpdateConfig","path":"Config/HotUpdateConfig","relyPackages":"","md5":""},"LuaConfig":{"name":"LuaConfig","path":"Config/LuaConfig","relyPackages":"","md5":""},"qeqweqwe":{"name":"qeqweqwe","path":"Config/qeqweqwe","relyPackages":"","md5":"1ae17d409cce51ba79fbfebd9b8a513"},"ResourcesConfig":{"name":"ResourcesConfig","path":"Config/ResourcesConfig","relyPackages":"","md5":"5f3c20c13de3ac54a574e3dfec50a560"},"version":{"name":"version","path":"Config/version","relyPackages":"","md5":"608d462d9f197b52d6d380827088c8a6"},"item":{"name":"item","path":"Data/item","relyPackages":"","md5":"83ac9b224602e5bdb24b7d05a43607"},"testData":{"name":"testData","path":"Data/testData","relyPackages":"","md5":"6f318f1dd178e738f675bb88a5adb84"},"LuaLuaTestWindow":{"name":"LuaLuaTestWindow","path":"Lua/UI/LuaLuaTestWindow","relyPackages":"","md5":""},"LuaTest2Window":{"name":"LuaTest2Window","path":"Lua/UI/LuaTest2Window","relyPackages":"","md5":""},"luaMain":{"name":"luaMain","path":"Lua/luaMain","relyPackages":"","md5":""},"LuaDataHelper":{"name":"LuaDataHelper","path":"LuaLib/FrameWork/Data/LuaDataHelper","relyPackages":"","md5":""},"LuaStatusManager":{"name":"LuaStatusManager","path":"LuaLib/FrameWork/Status/LuaStatusManager","relyPackages":"","md5":""},"LuaStatusMetaTable":{"name":"LuaStatusMetaTable","path":"LuaLib/FrameWork/Status/LuaStatusMetaTable","relyPackages":"","md5":""},"LuaUIManager":{"name":"LuaUIManager","path":"LuaLib/FrameWork/UI/LuaUIManager","relyPackages":"","md5":""},"LuaUIWindowMetatable":{"name":"LuaUIWindowMetatable","path":"LuaLib/FrameWork/UI/LuaUIWindowMetatable","relyPackages":"","md5":""},"LuaUpdate":{"name":"LuaUpdate","path":"LuaLib/FrameWork/Update/LuaUpdate","relyPackages":"","md5":""},"LuaFrameWorkEventName":{"name":"LuaFrameWorkEventName","path":"LuaLib/FrameWork/LuaFrameWorkEventName","relyPackages":"","md5":""},"LuaEventDispatcher":{"name":"LuaEventDispatcher","path":"LuaLib/LuaEventDispatcher","relyPackages":"","md5":""},"luaJson":{"name":"luaJson","path":"LuaLib/luaJson","relyPackages":"","md5":""},"LuaPrintTable":{"name":"LuaPrintTable","path":"LuaLib/LuaPrintTable","relyPackages":"","md5":""},"GameObject 1":{"name":"GameObject 1","path":"Prefab/GameObject 1","relyPackages":"","md5":"e872398f742beb762e90fda16ffc58cd"},"GameObject 2":{"name":"GameObject 2","path":"Prefab/GameObject 2","relyPackages":"","md5":"3c4f3a52458d17d928474cc753dc0ba"},"GameObject":{"name":"GameObject","path":"Prefab/GameObject","relyPackages":"","md5":"52d792d15aeb41eb2c1fde7931c1b0"},"gogo":{"name":"gogo","path":"Prefab/gogo","relyPackages":"","md5":"738c392070bf2f6aed82bbf8e5bf7b7"},"UItest 1":{"name":"UItest 1","path":"Prefab/UItest 1","relyPackages":"","md5":"c183f247a38118a49358c9cbaf97178"},"UItest 2":{"name":"UItest 2","path":"Prefab/UItest 2","relyPackages":"","md5":"e9e931e9cc1253486425e5560b496d1"},"UItest 3":{"name":"UItest 3","path":"Prefab/UItest 3","relyPackages":"","md5":"49eb2c1bbe25818475f70f8b365481c"},"UItest 4":{"name":"UItest 4","path":"Prefab/UItest 4","relyPackages":"","md5":"d0c715351f687423a7c6a6bd2a034c4"},"UItest 5":{"name":"UItest 5","path":"Prefab/UItest 5","relyPackages":"","md5":"cc399d507394679cbea58566262288"},"UItest 6":{"name":"UItest 6","path":"Prefab/UItest 6","relyPackages":"","md5":"107da4d67f0caab11eef8b9f1387acb"},"UItest":{"name":"UItest","path":"Prefab/UItest","relyPackages":"","md5":"5514fefccd7f2105ee3474a2cd1091"},"dl_01":{"name":"dl_01","path":"sprite/dl_01","relyPackages":"","md5":"846d23c565813beae593d882b43f796"},"dl_02":{"name":"dl_02","path":"sprite/dl_02","relyPackages":"","md5":"8587fb35a8968419479eadaa4893a7f"},"dl_03":{"name":"dl_03","path":"sprite/dl_03","relyPackages":"","md5":"ec5074405cc736abff3b38f774e03140"},"dl_04":{"name":"dl_04","path":"sprite/dl_04","relyPackages":"","md5":"2fb613c32d9a6192e445c4b54d9acb"},"dl_05":{"name":"dl_05","path":"sprite/dl_05","relyPackages":"","md5":"9d12f76c3aee5ef64bca564ce2ab4099"},"dl_07":{"name":"dl_07","path":"sprite/dl_07","relyPackages":"","md5":"869215666fc17f7296fdbe474467f45a"},"dl_08":{"name":"dl_08","path":"sprite/dl_08","relyPackages":"","md5":"2348b24634867fe03e2cb3f523aa639b"},"dl_09":{"name":"dl_09","path":"sprite/dl_09","relyPackages":"","md5":"4d8f6414cc63a24ca88bf17153189bea"},"AAAWindow":{"name":"AAAWindow","path":"UI/AAAWindow/AAAWindow","relyPackages":"","md5":""},"LuaTestWindow":{"name":"LuaTestWindow","path":"UI/LuaTestWindow/LuaTestWindow","relyPackages":"","md5":""},"test01Window":{"name":"test01Window","path":"UI/test01Window/test01Window","relyPackages":"","md5":"8248ee1f3d5ff9acd9ed8d6c6b2c8ad"},"test02Window":{"name":"test02Window","path":"UI/test02Window/test02Window","relyPackages":"","md5":"175b6d3035eaaf10bcc78b54ab21ecf"},"Test2Window":{"name":"Test2Window","path":"UI/Test2Window/Test2Window","relyPackages":"","md5":""},"Image_item":{"name":"Image_item","path":"UI/testWindow/Image_item","relyPackages":"","md5":""},"testWindow":{"name":"testWindow","path":"UI/testWindow/testWindow","relyPackages":"","md5":"e7ed1dfd7ee4c3554c342aa77ecd9e7b"},"UIManager":{"name":"UIManager","path":"UI/UIManager","relyPackages":"","md5":"6f517ca0d5487869e7e5c8c5e486e2"},"GameObject_adasd":{"name":"GameObject_adasd","path":"GameObject_adasd","relyPackages":"","md5":"f66634725c635ad230be3f453d217b3e"}}}
1+
{"relyBundles":{},"AssetsBundles":{"111":{"name":"111","path":"Config/111","relyPackages":"","md5":"7228da7250d357ec26e8755abdbd652"},"BundleConfig":{"name":"BundleConfig","path":"Config/BundleConfig","relyPackages":"","md5":"badc9c9de1319dc2b858eb54d4f843b"},"HotUpdateConfig":{"name":"HotUpdateConfig","path":"Config/HotUpdateConfig","relyPackages":"","md5":""},"LuaConfig":{"name":"LuaConfig","path":"Config/LuaConfig","relyPackages":"","md5":""},"qeqweqwe":{"name":"qeqweqwe","path":"Config/qeqweqwe","relyPackages":"","md5":"1ae17d409cce51ba79fbfebd9b8a513"},"ResourcesConfig":{"name":"ResourcesConfig","path":"Config/ResourcesConfig","relyPackages":"","md5":"5f3c20c13de3ac54a574e3dfec50a560"},"version":{"name":"version","path":"Config/version","relyPackages":"","md5":"608d462d9f197b52d6d380827088c8a6"},"item":{"name":"item","path":"Data/item","relyPackages":"","md5":"83ac9b224602e5bdb24b7d05a43607"},"testData":{"name":"testData","path":"Data/testData","relyPackages":"","md5":"6f318f1dd178e738f675bb88a5adb84"},"LuaLuaTestWindow":{"name":"LuaLuaTestWindow","path":"Lua/UI/LuaLuaTestWindow","relyPackages":"","md5":""},"LuaTest2Window":{"name":"LuaTest2Window","path":"Lua/UI/LuaTest2Window","relyPackages":"","md5":""},"luaMain":{"name":"luaMain","path":"Lua/luaMain","relyPackages":"","md5":""},"LuaDataHelper":{"name":"LuaDataHelper","path":"LuaLib/FrameWork/Data/LuaDataHelper","relyPackages":"","md5":""},"LuaStatusManager":{"name":"LuaStatusManager","path":"LuaLib/FrameWork/Status/LuaStatusManager","relyPackages":"","md5":""},"LuaStatusMetaTable":{"name":"LuaStatusMetaTable","path":"LuaLib/FrameWork/Status/LuaStatusMetaTable","relyPackages":"","md5":""},"LuaUIManager":{"name":"LuaUIManager","path":"LuaLib/FrameWork/UI/LuaUIManager","relyPackages":"","md5":""},"LuaUIWindowMetatable":{"name":"LuaUIWindowMetatable","path":"LuaLib/FrameWork/UI/LuaUIWindowMetatable","relyPackages":"","md5":""},"LuaUpdate":{"name":"LuaUpdate","path":"LuaLib/FrameWork/Update/LuaUpdate","relyPackages":"","md5":""},"LuaFrameWorkEventName":{"name":"LuaFrameWorkEventName","path":"LuaLib/FrameWork/LuaFrameWorkEventName","relyPackages":"","md5":""},"LuaUnityDefine":{"name":"LuaUnityDefine","path":"LuaLib/Unity/LuaUnityDefine","relyPackages":"","md5":""},"LuaEventDispatcher":{"name":"LuaEventDispatcher","path":"LuaLib/LuaEventDispatcher","relyPackages":"","md5":""},"luaJson":{"name":"luaJson","path":"LuaLib/luaJson","relyPackages":"","md5":""},"LuaPrintTable":{"name":"LuaPrintTable","path":"LuaLib/LuaPrintTable","relyPackages":"","md5":""},"GameObject 1":{"name":"GameObject 1","path":"Prefab/GameObject 1","relyPackages":"","md5":"e872398f742beb762e90fda16ffc58cd"},"GameObject 2":{"name":"GameObject 2","path":"Prefab/GameObject 2","relyPackages":"","md5":"3c4f3a52458d17d928474cc753dc0ba"},"GameObject":{"name":"GameObject","path":"Prefab/GameObject","relyPackages":"","md5":"52d792d15aeb41eb2c1fde7931c1b0"},"gogo":{"name":"gogo","path":"Prefab/gogo","relyPackages":"","md5":"738c392070bf2f6aed82bbf8e5bf7b7"},"UItest 1":{"name":"UItest 1","path":"Prefab/UItest 1","relyPackages":"","md5":"c183f247a38118a49358c9cbaf97178"},"UItest 2":{"name":"UItest 2","path":"Prefab/UItest 2","relyPackages":"","md5":"e9e931e9cc1253486425e5560b496d1"},"UItest 3":{"name":"UItest 3","path":"Prefab/UItest 3","relyPackages":"","md5":"49eb2c1bbe25818475f70f8b365481c"},"UItest 4":{"name":"UItest 4","path":"Prefab/UItest 4","relyPackages":"","md5":"d0c715351f687423a7c6a6bd2a034c4"},"UItest 5":{"name":"UItest 5","path":"Prefab/UItest 5","relyPackages":"","md5":"cc399d507394679cbea58566262288"},"UItest 6":{"name":"UItest 6","path":"Prefab/UItest 6","relyPackages":"","md5":"107da4d67f0caab11eef8b9f1387acb"},"UItest":{"name":"UItest","path":"Prefab/UItest","relyPackages":"","md5":"5514fefccd7f2105ee3474a2cd1091"},"dl_01":{"name":"dl_01","path":"sprite/dl_01","relyPackages":"","md5":"846d23c565813beae593d882b43f796"},"dl_02":{"name":"dl_02","path":"sprite/dl_02","relyPackages":"","md5":"8587fb35a8968419479eadaa4893a7f"},"dl_03":{"name":"dl_03","path":"sprite/dl_03","relyPackages":"","md5":"ec5074405cc736abff3b38f774e03140"},"dl_04":{"name":"dl_04","path":"sprite/dl_04","relyPackages":"","md5":"2fb613c32d9a6192e445c4b54d9acb"},"dl_05":{"name":"dl_05","path":"sprite/dl_05","relyPackages":"","md5":"9d12f76c3aee5ef64bca564ce2ab4099"},"dl_07":{"name":"dl_07","path":"sprite/dl_07","relyPackages":"","md5":"869215666fc17f7296fdbe474467f45a"},"dl_08":{"name":"dl_08","path":"sprite/dl_08","relyPackages":"","md5":"2348b24634867fe03e2cb3f523aa639b"},"dl_09":{"name":"dl_09","path":"sprite/dl_09","relyPackages":"","md5":"4d8f6414cc63a24ca88bf17153189bea"},"AAAWindow":{"name":"AAAWindow","path":"UI/AAAWindow/AAAWindow","relyPackages":"","md5":""},"LuaTestWindow":{"name":"LuaTestWindow","path":"UI/LuaTestWindow/LuaTestWindow","relyPackages":"","md5":""},"test01Window":{"name":"test01Window","path":"UI/test01Window/test01Window","relyPackages":"","md5":"8248ee1f3d5ff9acd9ed8d6c6b2c8ad"},"test02Window":{"name":"test02Window","path":"UI/test02Window/test02Window","relyPackages":"","md5":"175b6d3035eaaf10bcc78b54ab21ecf"},"Test2Window":{"name":"Test2Window","path":"UI/Test2Window/Test2Window","relyPackages":"","md5":""},"Image_item":{"name":"Image_item","path":"UI/testWindow/Image_item","relyPackages":"","md5":""},"testWindow":{"name":"testWindow","path":"UI/testWindow/testWindow","relyPackages":"","md5":"e7ed1dfd7ee4c3554c342aa77ecd9e7b"},"UIManager":{"name":"UIManager","path":"UI/UIManager","relyPackages":"","md5":"6f517ca0d5487869e7e5c8c5e486e2"},"GameObject_adasd":{"name":"GameObject_adasd","path":"GameObject_adasd","relyPackages":"","md5":"f66634725c635ad230be3f453d217b3e"}}}

‎Assets/Script/Core/Lua/ToLua/Core/LuaState.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,19 @@ public LuaState()
108108
stateMap.Add(L, this);
109109
OpenToLuaLibs();
110110
ToLua.OpenLibs(L);
111-
111+
//OpenBaseLibs();
112112

113113
LuaSetTop(0);
114114

115115

116116

117-
//OpenBaseLibs();
117+
118118
//InitLuaPath();
119119

120120
}
121121

122-
//void OpenBaseLibs()
123-
//{
122+
void OpenBaseLibs()
123+
{
124124
// BeginModule(null);
125125

126126
// BeginModule("System");
@@ -163,18 +163,19 @@ public LuaState()
163163

164164
// EndModule(); //end global
165165

166-
// LuaUnityLibs.OpenLibs(L);
166+
LuaUnityLibs.OpenLibs(L);
167167
// LuaReflection.OpenLibs(L);
168168
// ArrayMetatable = metaMap[typeof(System.Array)];
169169
// TypeMetatable = metaMap[typeof(System.Type)];
170170
// DelegateMetatable = metaMap[typeof(System.Delegate)];
171171
// EnumMetatable = metaMap[typeof(System.Enum)];
172172
// IterMetatable = metaMap[typeof(IEnumerator)];
173173
// EventMetatable = metaMap[typeof(EventObject)];
174-
//}
174+
}
175175

176176
void OpenBaseLuaLibs()
177177
{
178+
178179
//DoFile("tolua.lua"); //tolua table名字已经存在了,不能用require
179180
LuaUnityLibs.OpenLuaLibs(L);
180181
}
@@ -184,8 +185,8 @@ public void Start()
184185
#if UNITY_EDITOR
185186
beStart = true;
186187
#endif
187-
//Debugger.Log("LuaState start");
188188
//OpenBaseLuaLibs();
189+
189190
//PackBounds = GetFuncRef("Bounds.New");
190191
//UnpackBounds = GetFuncRef("Bounds.Get");
191192
//PackRay = GetFuncRef("Ray.New");

‎Assets/Script/Core/Lua/ToLua/Core/LuaUnityLibs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void OpenLibs(IntPtr L)
3434
}
3535

3636
public static void OpenLuaLibs(IntPtr L)
37-
{
37+
{
3838
//if (LuaDLL.tolua_openlualibs(L) != 0)
3939
//{
4040
// string error = LuaDLL.lua_tostring(L, -1);

‎Assets/Script/Core/Lua/ToLua/Core/ToLua.cs‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -363,27 +363,12 @@ static int GetClassType(IntPtr L)
363363

364364
switch (ret)
365365
{
366-
case LuaValueType.Vector3:
367-
Push(L, typeof(Vector3));
368-
break;
369-
case LuaValueType.Quaternion:
370-
Push(L, typeof(Quaternion));
371-
break;
372-
case LuaValueType.Vector4:
373-
Push(L, typeof(Vector4));
374-
break;
375-
case LuaValueType.Color:
376-
Push(L, typeof(Color));
377-
break;
378366
case LuaValueType.Ray:
379367
Push(L, typeof(Ray));
380368
break;
381369
case LuaValueType.Bounds:
382370
Push(L, typeof(Bounds));
383371
break;
384-
case LuaValueType.Vector2:
385-
Push(L, typeof(Vector2));
386-
break;
387372
case LuaValueType.LayerMask:
388373
Push(L, typeof(LayerMask));
389374
break;
@@ -1101,26 +1086,6 @@ public static object CheckVarObject(IntPtr L, int stackPos, Type t)
11011086
double d = LuaDLL.luaL_checknumber(L, stackPos);
11021087
return Convert.ChangeType(d, t);
11031088
}
1104-
else if (t == typeof(Vector3))
1105-
{
1106-
return CheckVector3(L, stackPos);
1107-
}
1108-
else if (t == typeof(Quaternion))
1109-
{
1110-
return CheckQuaternion(L, stackPos);
1111-
}
1112-
else if (t == typeof(Vector2))
1113-
{
1114-
return CheckVector2(L, stackPos);
1115-
}
1116-
else if (t == typeof(Vector4))
1117-
{
1118-
return CheckVector4(L, stackPos);
1119-
}
1120-
else if (t == typeof(Color))
1121-
{
1122-
return CheckColor(L, stackPos);
1123-
}
11241089
else if (t == typeof(Ray))
11251090
{
11261091
return CheckRay(L, stackPos);
@@ -1751,31 +1716,6 @@ public static T[] CheckParamsObject<T>(IntPtr L, int stackPos, int count)
17511716
return list;
17521717
}
17531718

1754-
public static void Push(IntPtr L, Vector3 v3)
1755-
{
1756-
LuaDLL.tolua_pushvec3(L, v3.x, v3.y, v3.z);
1757-
}
1758-
1759-
public static void Push(IntPtr L, Vector2 v2)
1760-
{
1761-
LuaDLL.tolua_pushvec2(L, v2.x, v2.y);
1762-
}
1763-
1764-
public static void Push(IntPtr L, Vector4 v4)
1765-
{
1766-
LuaDLL.tolua_pushvec4(L, v4.x, v4.y, v4.z, v4.w);
1767-
}
1768-
1769-
public static void Push(IntPtr L, Quaternion q)
1770-
{
1771-
LuaDLL.tolua_pushquat(L, q.x, q.y, q.z, q.w);
1772-
}
1773-
1774-
public static void Push(IntPtr L, Color clr)
1775-
{
1776-
LuaDLL.tolua_pushclr(L, clr.r, clr.g, clr.b, clr.a);
1777-
}
1778-
17791719
public static void Push(IntPtr L, Ray ray)
17801720
{
17811721
LuaStatic.GetPackRay(L);
@@ -2226,26 +2166,10 @@ public static void Push(IntPtr L, object obj)
22262166
double d = LuaMisc.ToDouble(obj);
22272167
LuaDLL.lua_pushnumber(L, d);
22282168
}
2229-
else if (t == typeof(Vector3))
2230-
{
2231-
Push(L, (Vector3)obj);
2232-
}
22332169
else if (t == typeof(Quaternion))
22342170
{
22352171
Push(L, (Quaternion)obj);
22362172
}
2237-
else if (t == typeof(Vector2))
2238-
{
2239-
Push(L, (Vector2)obj);
2240-
}
2241-
else if (t == typeof(Vector4))
2242-
{
2243-
Push(L, (Vector4)obj);
2244-
}
2245-
else if (t == typeof(Color))
2246-
{
2247-
Push(L, (Color)obj);
2248-
}
22492173
else if (t == typeof(RaycastHit))
22502174
{
22512175
Push(L, (RaycastHit)obj);

0 commit comments

Comments
 (0)