更新Xlua 到最新版本

2024-09-04 02:07:48 +08:00
parent dba48de5cf
commit 5b79a2d4bb
227 changed files with 5594 additions and 878 deletions
--- a/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.cs
+++ b/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.cs
@ -0,0 +1,315 @@
+/*
+ * Tencent is pleased to support the open source community by making xLua available.
+ * Copyright (C) 2016 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+*/
+
+using UnityEngine;
+using System.Collections;
+using System;
+using XLua;
+using System.Collections.Generic;
+
+namespace Tutorial
+{
+	[LuaCallCSharp]
+	public class BaseClass
+	{
+		public static void BSFunc()
+		{
+			Debug.Log("Derived Static Func, BSF = " + BSF);
+		}
+
+		public static int BSF = 1;
+
+		public void BMFunc()
+		{
+			Debug.Log("Derived Member Func, BMF = " + BMF);
+		}
+
+		public int BMF { get; set; }
+	}
+
+	public struct Param1
+	{
+		public int x;
+		public string y;
+	}
+
+	[LuaCallCSharp]
+	public enum TestEnum
+	{
+		E1,
+		E2
+	}
+
+
+	[LuaCallCSharp]
+	public class DerivedClass : BaseClass
+	{
+		[LuaCallCSharp]
+		public enum TestEnumInner
+		{
+			E3,
+			E4
+		}
+
+		public void DMFunc()
+		{
+			Debug.Log("Derived Member Func, DMF = " + DMF);
+		}
+
+		public int DMF { get; set; }
+
+		public double ComplexFunc(Param1 p1, ref int p2, out string p3, Action luafunc, out Action csfunc)
+		{
+			Debug.Log("P1 = {x=" + p1.x + ",y=" + p1.y + "},p2 = " + p2);
+			luafunc();
+			p2 = p2 * p1.x;
+			p3 = "hello " + p1.y;
+			csfunc = () =>
+			{
+				Debug.Log("csharp callback invoked!");
+			};
+			return 1.23;
+		}
+
+		public void TestFunc(int i)
+		{
+			Debug.Log("TestFunc(int i)");
+		}
+
+		public void TestFunc(string i)
+		{
+			Debug.Log("TestFunc(string i)");
+		}
+
+		public static DerivedClass operator +(DerivedClass a, DerivedClass b)
+		{
+            DerivedClass ret = new DerivedClass();
+			ret.DMF = a.DMF + b.DMF;
+			return ret;
+		}
+
+		public void DefaultValueFunc(int a = 100, string b = "cccc", string c = null)
+		{
+			UnityEngine.Debug.Log("DefaultValueFunc: a=" + a + ",b=" + b + ",c=" + c);
+		}
+
+		public void VariableParamsFunc(int a, params string[] strs)
+		{
+			UnityEngine.Debug.Log("VariableParamsFunc: a =" + a);
+			foreach (var str in strs)
+			{
+				UnityEngine.Debug.Log("str:" + str);
+			}
+		}
+
+		public TestEnum EnumTestFunc(TestEnum e)
+		{
+			Debug.Log("EnumTestFunc: e=" + e);
+			return TestEnum.E2;
+		}
+
+		public Action<string> TestDelegate = (param) =>
+		{
+			Debug.Log("TestDelegate in c#:" + param);
+		};
+
+		public event Action TestEvent;
+
+		public void CallEvent()
+		{
+			TestEvent();
+		}
+
+		public ulong TestLong(long n)
+		{
+			return (ulong)(n + 1);
+		}
+
+		class InnerCalc : ICalc
+		{
+			public int add(int a, int b)
+			{
+				return a + b;
+			}
+
+			public int id = 100;
+		}
+
+		public ICalc GetCalc()
+		{
+			return new InnerCalc();
+		}
+
+		public void GenericMethod<T>()
+		{
+			Debug.Log("GenericMethod<" + typeof(T) + ">");
+		}
+	}
+
+	[LuaCallCSharp]
+	public interface ICalc
+	{
+		int add(int a, int b);
+	}
+
+	[LuaCallCSharp]
+	public static class DerivedClassExtensions
+    {
+		public static int GetSomeData(this DerivedClass obj)
+		{
+			Debug.Log("GetSomeData ret = " + obj.DMF);
+			return obj.DMF;
+		}
+
+		public static int GetSomeBaseData(this BaseClass obj)
+		{
+			Debug.Log("GetSomeBaseData ret = " + obj.BMF);
+			return obj.BMF;
+		}
+
+		public static void GenericMethodOfString(this DerivedClass obj)
+		{
+			obj.GenericMethod<string>();
+		}
+	}
+}
+
+public class LuaCallCs : MonoBehaviour
+{
+	LuaEnv luaenv = null;
+	string script = @"
+        function demo()
+            --new C#对象
+            local newGameObj = CS.UnityEngine.GameObject()
+            local newGameObj2 = CS.UnityEngine.GameObject('helloworld')
+            print(newGameObj, newGameObj2)
+        
+            --访问静态属性，方法
+            local GameObject = CS.UnityEngine.GameObject
+            print('UnityEngine.Time.deltaTime:', CS.UnityEngine.Time.deltaTime) --读静态属性
+            CS.UnityEngine.Time.timeScale = 0.5 --写静态属性
+            print('helloworld', GameObject.Find('helloworld')) --静态方法调用
+
+            --访问成员属性，方法
+            local DerivedClass = CS.Tutorial.DerivedClass
+            local testobj = DerivedClass()
+            testobj.DMF = 1024--设置成员属性
+            print(testobj.DMF)--读取成员属性
+            testobj:DMFunc()--成员方法
+
+            --基类属性，方法
+            print(DerivedClass.BSF)--读基类静态属性
+            DerivedClass.BSF = 2048--写基类静态属性
+            DerivedClass.BSFunc();--基类静态方法
+            print(testobj.BMF)--读基类成员属性
+            testobj.BMF = 4096--写基类成员属性
+            testobj:BMFunc()--基类方法调用
+
+            --复杂方法调用
+            local ret, p2, p3, csfunc = testobj:ComplexFunc({x=3, y = 'john'}, 100, function()
+               print('i am lua callback')
+            end)
+            print('ComplexFunc ret:', ret, p2, p3, csfunc)
+            csfunc()
+
+            --重载方法调用
+            testobj:TestFunc(100)
+            testobj:TestFunc('hello')
+
+            --操作符
+            local testobj2 = DerivedClass()
+            testobj2.DMF = 2048
+            print('(testobj + testobj2).DMF = ', (testobj + testobj2).DMF)
+
+            --默认值
+            testobj:DefaultValueFunc(1)
+            testobj:DefaultValueFunc(3, 'hello', 'john')
+
+            --可变参数
+            testobj:VariableParamsFunc(5, 'hello', 'john')
+
+            --Extension methods
+            print(testobj:GetSomeData()) 
+            print(testobj:GetSomeBaseData()) --访问基类的Extension methods
+            testobj:GenericMethodOfString()  --通过Extension methods实现访问泛化方法
+
+            --枚举类型
+            local e = testobj:EnumTestFunc(CS.Tutorial.TestEnum.E1)
+            print(e, e == CS.Tutorial.TestEnum.E2)
+            print(CS.Tutorial.TestEnum.__CastFrom(1), CS.Tutorial.TestEnum.__CastFrom('E1'))
+            print(CS.Tutorial.DerivedClass.TestEnumInner.E3)
+            assert(CS.Tutorial.BaseClass.TestEnumInner == nil)
+
+            --Delegate
+            testobj.TestDelegate('hello') --直接调用
+            local function lua_delegate(str)
+                print('TestDelegate in lua:', str)
+            end
+            testobj.TestDelegate = lua_delegate + testobj.TestDelegate --combine，这里演示的是C#delegate作为右值，左值也支持
+            testobj.TestDelegate('hello')
+            testobj.TestDelegate = testobj.TestDelegate - lua_delegate --remove
+            testobj.TestDelegate('hello')
+
+            --事件
+            local function lua_event_callback1() print('lua_event_callback1') end
+            local function lua_event_callback2() print('lua_event_callback2') end
+            testobj:TestEvent('+', lua_event_callback1)
+            testobj:CallEvent()
+            testobj:TestEvent('+', lua_event_callback2)
+            testobj:CallEvent()
+            testobj:TestEvent('-', lua_event_callback1)
+            testobj:CallEvent()
+            testobj:TestEvent('-', lua_event_callback2)
+
+            --64位支持
+            local l = testobj:TestLong(11)
+            print(type(l), l, l + 100, 10000 + l)
+
+            --typeof
+            newGameObj:AddComponent(typeof(CS.UnityEngine.ParticleSystem))
+
+            --cast
+            local calc = testobj:GetCalc()
+            print('assess instance of InnerCalc via reflection', calc:add(1, 2))
+            assert(calc.id == 100)
+            cast(calc, typeof(CS.Tutorial.ICalc))
+            print('cast to interface ICalc', calc:add(1, 2))
+            assert(calc.id == nil)
+       end
+
+       demo()
+
+       --协程下使用
+       local co = coroutine.create(function()
+           print('------------------------------------------------------')
+           demo()
+       end)
+       assert(coroutine.resume(co))
+    ";
+
+	// Use this for initialization
+	void Start()
+	{
+		luaenv = new LuaEnv();
+		luaenv.DoString(script);
+	}
+
+	// Update is called once per frame
+	void Update()
+	{
+		if (luaenv != null)
+		{
+			luaenv.Tick();
+		}
+	}
+
+	void OnDestroy()
+	{
+		luaenv.Dispose();
+	}
+}
--- a/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.cs.meta
+++ b/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.cs.meta
@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 567af7ecaa3d5994c97448357665421b
+timeCreated: 1456111221
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.unity
+++ b/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.unity
@ -0,0 +1,281 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 8
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_TemporalCoherenceThreshold: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 1
+  m_LightmapEditorSettings:
+    serializedVersion: 9
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_TextureWidth: 1024
+    m_TextureHeight: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 0
+    m_CompAOExponentDirect: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 1024
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 1
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVRFilteringMode: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ShowResolutionOverlay: 1
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 0
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &1583020649
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1583020655}
+  - component: {fileID: 1583020654}
+  - component: {fileID: 1583020653}
+  - component: {fileID: 1583020652}
+  - component: {fileID: 1583020651}
+  - component: {fileID: 1583020650}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1583020650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1583020649}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 567af7ecaa3d5994c97448357665421b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!81 &1583020651
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1583020649}
+  m_Enabled: 1
+--- !u!124 &1583020652
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1583020649}
+  m_Enabled: 1
+--- !u!92 &1583020653
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1583020649}
+  m_Enabled: 1
+--- !u!20 &1583020654
+Camera:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1583020649}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 0
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1583020655
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1583020649}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2018045144
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 2018045146}
+  - component: {fileID: 2018045145}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &2018045145
+Light:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2018045144}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 1
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &2018045146
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2018045144}
+  m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.109381676, w: 0.87542605}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.unity.meta
+++ b/Assets/XLua/Tutorial/LuaCallCSharp/LuaCallCs.unity.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5a67740111b6144d874577073176b35
+timeCreated: 1456111594
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: