From 4bf48e6ee6494d032cd6f6a0d241ed28d7d0bf74 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Fri, 9 Aug 2024 12:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90wrap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effectMaterials/x1_mat_GuidePanelMat.mat | 4 +- Assets/LuaFramework/Scenes/Logo.unity | 852 ++++++++++++++++++ Assets/ManagedResources/~Lua/Data/UIData.lua | 1 + .../GoodFriend/GoodFriendMainPanel.lua | 4 +- Assets/Source/Generate/DelegateFactory.cs | 218 ++--- .../Generate/UnityEngine_GameObjectWrap.cs | 608 ++++++------- .../Source/Generate/UnityEngine_InputWrap.cs | 22 +- .../Generate/UnityEngine_RectTransformWrap.cs | 28 +- 8 files changed, 1295 insertions(+), 442 deletions(-) diff --git a/Assets/Art/effectMaterials/x1_mat_GuidePanelMat.mat b/Assets/Art/effectMaterials/x1_mat_GuidePanelMat.mat index 10158f492..c590d3a12 100644 --- a/Assets/Art/effectMaterials/x1_mat_GuidePanelMat.mat +++ b/Assets/Art/effectMaterials/x1_mat_GuidePanelMat.mat @@ -76,8 +76,8 @@ Material: - _SrcBlend: 1 - _Trans: 10 - _UVSec: 0 - - _X: 0.5 - - _Y: 0.5 + - _X: 0.9375 + - _Y: 0.73000014 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity index bdc73466e..88b5fcc8f 100644 --- a/Assets/LuaFramework/Scenes/Logo.unity +++ b/Assets/LuaFramework/Scenes/Logo.unity @@ -288,6 +288,290 @@ RectTransform: m_AnchoredPosition: {x: 0.26726648, y: 0.43754014} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1258317025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 118256, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_Name + value: UIRoot + objectReference: {fileID: 0} + - target: {fileID: 118256, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1458808111617876, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalPosition.y + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132084493212212, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99b0fede6f9ae7946b30748aa8bfc627, type: 3} +--- !u!1001 &1303197772 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1965321532} + m_Modifications: + - target: {fileID: 1506569333037798674, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_SizeDelta.y + value: 272 + objectReference: {fileID: 0} + - target: {fileID: 3568893516934391968, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3568893516934391968, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3568893516934391968, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 3568893516934391968, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -272 + objectReference: {fileID: 0} + - target: {fileID: 3568893516934391968, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5122947903395153176, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5122947903395153176, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5122947903395153176, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 7562368478734090481, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_Name + value: CommonInfoPopup + objectReference: {fileID: 0} + - target: {fileID: 7562368478734090481, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7775692205861864899, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7775848301174822185, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 7775848301174822185, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7775848301174822185, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7775848301174822185, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -131 + objectReference: {fileID: 0} + - target: {fileID: 7775848301174822185, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_SizeDelta.y + value: 262 + objectReference: {fileID: 0} + - target: {fileID: 7776147267272310759, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7776147267272310759, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7776147267272310759, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 840 + objectReference: {fileID: 0} + - target: {fileID: 7776147267272310759, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -200 + objectReference: {fileID: 0} + - target: {fileID: 7776147267272310759, guid: a92f96d4493d2dd44b41d10317a5ef47, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a92f96d4493d2dd44b41d10317a5ef47, type: 3} --- !u!1001 &1753642328 PrefabInstance: m_ObjectHideFlags: 0 @@ -372,3 +656,571 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 986ad473b78d14e08b1f05d368cb1591, type: 3} +--- !u!224 &1965321532 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224217409807388486, guid: 99b0fede6f9ae7946b30748aa8bfc627, + type: 3} + m_PrefabInstance: {fileID: 1258317025} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2076345567 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1965321532} + m_Modifications: + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_SizeDelta.x + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_SizeDelta.y + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2822836076449748321, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2893589083715765982, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_Name + value: HegemonyTipPopup + objectReference: {fileID: 0} + - target: {fileID: 2893589083715765982, guid: c9f82814422ddf34392eaa00baf6168f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c9f82814422ddf34392eaa00baf6168f, type: 3} +--- !u!1001 &2105947211 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1965321532} + m_Modifications: + - target: {fileID: 643311994815827731, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 643311994815827731, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 643311994815827731, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 643311994815827731, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 689250897652745416, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 689250897652745416, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 689250897652745416, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 689250897652745416, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1500591270287815668, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1500591270287815668, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1500591270287815668, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1500591270287815668, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1948015874730491992, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2414274817469905694, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2414274817469905694, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2414274817469905694, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 2414274817469905694, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -393 + objectReference: {fileID: 0} + - target: {fileID: 2707091993737346245, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2707091993737346245, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2707091993737346245, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2707091993737346245, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4014128951586813117, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4014128951586813117, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4014128951586813117, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 4014128951586813117, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -837 + objectReference: {fileID: 0} + - target: {fileID: 5758214106657452038, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5758214106657452038, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5758214106657452038, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 5758214106657452038, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -615 + objectReference: {fileID: 0} + - target: {fileID: 6299398156166508888, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6299398156166508888, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6299398156166508888, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 6299398156166508888, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -171 + objectReference: {fileID: 0} + - target: {fileID: 6484351146561415711, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.00000483644 + objectReference: {fileID: 0} + - target: {fileID: 6484351146561415711, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_SizeDelta.y + value: -442 + objectReference: {fileID: 0} + - target: {fileID: 7498047194541490674, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_Name + value: OperatingTokensPanel + objectReference: {fileID: 0} + - target: {fileID: 8561957397680853825, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8561957397680853825, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8561957397680853825, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 96 + objectReference: {fileID: 0} + - target: {fileID: 8561957397680853825, guid: 987f6342bf8828045a956f29e796508e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -1059 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 987f6342bf8828045a956f29e796508e, type: 3} +--- !u!1001 &184979392786319121 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1965321532} + m_Modifications: + - target: {fileID: 7459130939173058538, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8450342198555473235, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_Name + value: CommonConfirmTipPanel + objectReference: {fileID: 0} + - target: {fileID: 8450342198555473235, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_SizeDelta.x + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_SizeDelta.y + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8809332178908751596, guid: 22e2600533d9bfd47881d7fb8ed7148f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22e2600533d9bfd47881d7fb8ed7148f, type: 3} diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index ea5677de9..baa929120 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -549,6 +549,7 @@ UIName = { NewcomerDiscountsPanel = 2016, -- 新手特惠 CommonConfirmTipPanel = 2017, --公用确认弹窗 OperatingTokensPanel = 2018, --代币商城界面 + } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua index 2b0485f2a..1b7ddb605 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua @@ -768,7 +768,7 @@ function this.BtnClickEvnet(index) this.mask.localPosition = this.friendSearchBtn.transform.localPosition - Vector3.New(15,0,0) this.maskText.text = this.friendSearchText.text this.maskText.transform.localPosition = this.maskTextCurPos - GoodFriendManager.RefreshRecommend(2) + --GoodFriendManager.RefreshRecommend(2) elseif index == 4 then this.friendList:SetActive(false) this.friendApplication:SetActive(false) @@ -783,7 +783,7 @@ function this.BtnClickEvnet(index) this.mask.localPosition = this.blackListBtn.transform.localPosition - Vector3.New(15,0,0) this.maskText.text = this.blackListText.text this.maskText.transform.localPosition = this.maskTextCurPos + Vector3.New(10.6,0,0) - GoodFriendManager.RefreshRecommend(4) + --GoodFriendManager.RefreshRecommend(4) end end return GoodFriendMainPanel \ No newline at end of file diff --git a/Assets/Source/Generate/DelegateFactory.cs b/Assets/Source/Generate/DelegateFactory.cs index 26007d229..1c7c86ddb 100644 --- a/Assets/Source/Generate/DelegateFactory.cs +++ b/Assets/Source/Generate/DelegateFactory.cs @@ -377,115 +377,115 @@ public class DelegateFactory StackTraits.Push = factory.Push_UnityEngine_Video_VideoPlayer_TimeEventHandler; StackTraits.Push = factory.Push_UnityEngine_Video_VideoPlayer_FrameReadyEventHandler; } - - public static Delegate CreateDelegate(Type t, LuaFunction func = null) - { - DelegateCreate Create = null; - - if (!dict.TryGetValue(t, out Create)) - { - throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t))); - } - - if (func != null) - { - LuaState state = func.GetLuaState(); - LuaDelegate target = state.GetLuaDelegate(func); - - if (target != null) - { - return Delegate.CreateDelegate(t, target, target.method); - } - else - { - Delegate d = Create(func, null, false); - target = d.Target as LuaDelegate; - state.AddLuaDelegate(target, func); - return d; - } - } - - return Create(null, null, false); - } - - public static Delegate CreateDelegate(Type t, LuaFunction func, LuaTable self) - { - DelegateCreate Create = null; - - if (!dict.TryGetValue(t, out Create)) - { - throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t))); - } - - if (func != null) - { - LuaState state = func.GetLuaState(); - LuaDelegate target = state.GetLuaDelegate(func, self); - - if (target != null) - { - return Delegate.CreateDelegate(t, target, target.method); - } - else - { - Delegate d = Create(func, self, true); - target = d.Target as LuaDelegate; - state.AddLuaDelegate(target, func, self); - return d; - } - } - - return Create(null, null, true); - } - - public static Delegate RemoveDelegate(Delegate obj, LuaFunction func) - { - LuaState state = func.GetLuaState(); - Delegate[] ds = obj.GetInvocationList(); - - for (int i = 0; i < ds.Length; i++) - { - LuaDelegate ld = ds[i].Target as LuaDelegate; - - if (ld != null && ld.func == func) - { - obj = Delegate.Remove(obj, ds[i]); - state.DelayDispose(ld.func); - break; - } - } - - return obj; - } - - public static Delegate RemoveDelegate(Delegate obj, Delegate dg) - { - LuaDelegate remove = dg.Target as LuaDelegate; - - if (remove == null) - { - obj = Delegate.Remove(obj, dg); - return obj; - } - - LuaState state = remove.func.GetLuaState(); - Delegate[] ds = obj.GetInvocationList(); - - for (int i = 0; i < ds.Length; i++) - { - LuaDelegate ld = ds[i].Target as LuaDelegate; - - if (ld != null && ld == remove) - { - obj = Delegate.Remove(obj, ds[i]); - state.DelayDispose(ld.func); - state.DelayDispose(ld.self); - break; - } - } - - return obj; - } + + public static Delegate CreateDelegate(Type t, LuaFunction func = null) + { + DelegateCreate Create = null; + + if (!dict.TryGetValue(t, out Create)) + { + throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t))); + } + + if (func != null) + { + LuaState state = func.GetLuaState(); + LuaDelegate target = state.GetLuaDelegate(func); + + if (target != null) + { + return Delegate.CreateDelegate(t, target, target.method); + } + else + { + Delegate d = Create(func, null, false); + target = d.Target as LuaDelegate; + state.AddLuaDelegate(target, func); + return d; + } + } + + return Create(null, null, false); + } + + public static Delegate CreateDelegate(Type t, LuaFunction func, LuaTable self) + { + DelegateCreate Create = null; + + if (!dict.TryGetValue(t, out Create)) + { + throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t))); + } + + if (func != null) + { + LuaState state = func.GetLuaState(); + LuaDelegate target = state.GetLuaDelegate(func, self); + + if (target != null) + { + return Delegate.CreateDelegate(t, target, target.method); + } + else + { + Delegate d = Create(func, self, true); + target = d.Target as LuaDelegate; + state.AddLuaDelegate(target, func, self); + return d; + } + } + + return Create(null, null, true); + } + + public static Delegate RemoveDelegate(Delegate obj, LuaFunction func) + { + LuaState state = func.GetLuaState(); + Delegate[] ds = obj.GetInvocationList(); + + for (int i = 0; i < ds.Length; i++) + { + LuaDelegate ld = ds[i].Target as LuaDelegate; + + if (ld != null && ld.func == func) + { + obj = Delegate.Remove(obj, ds[i]); + state.DelayDispose(ld.func); + break; + } + } + + return obj; + } + + public static Delegate RemoveDelegate(Delegate obj, Delegate dg) + { + LuaDelegate remove = dg.Target as LuaDelegate; + + if (remove == null) + { + obj = Delegate.Remove(obj, dg); + return obj; + } + + LuaState state = remove.func.GetLuaState(); + Delegate[] ds = obj.GetInvocationList(); + + for (int i = 0; i < ds.Length; i++) + { + LuaDelegate ld = ds[i].Target as LuaDelegate; + + if (ld != null && ld == remove) + { + obj = Delegate.Remove(obj, ds[i]); + state.DelayDispose(ld.func); + state.DelayDispose(ld.self); + break; + } + } + + return obj; + } class System_Action_Event : LuaDelegate { diff --git a/Assets/Source/Generate/UnityEngine_GameObjectWrap.cs b/Assets/Source/Generate/UnityEngine_GameObjectWrap.cs index a24c0e3c3..81cca8d8c 100644 --- a/Assets/Source/Generate/UnityEngine_GameObjectWrap.cs +++ b/Assets/Source/Generate/UnityEngine_GameObjectWrap.cs @@ -395,328 +395,328 @@ public class UnityEngine_GameObjectWrap [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int AddComponent(IntPtr L) { - IntPtr L0 = LuaException.L; - - try - { - ++LuaException.InstantiateCount; - LuaException.L = L; - ToLua.CheckArgsCount(L, 2); - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - System.Type arg0 = ToLua.CheckMonoType(L, 2); - UnityEngine.Component o = obj.AddComponent(arg0); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - ToLua.Push(L, o); - LuaException.L = L0; - --LuaException.InstantiateCount; - return 1; - } - catch (Exception e) - { - LuaException.L = L0; - --LuaException.InstantiateCount; - return LuaDLL.toluaL_exception(L, e); + IntPtr L0 = LuaException.L; + + try + { + ++LuaException.InstantiateCount; + LuaException.L = L; + ToLua.CheckArgsCount(L, 2); + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + System.Type arg0 = ToLua.CheckMonoType(L, 2); + UnityEngine.Component o = obj.AddComponent(arg0); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + ToLua.Push(L, o); + LuaException.L = L0; + --LuaException.InstantiateCount; + return 1; + } + catch (Exception e) + { + LuaException.L = L0; + --LuaException.InstantiateCount; + return LuaDLL.toluaL_exception(L, e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int BroadcastMessage(IntPtr L) { - IntPtr L0 = LuaException.L; - - try - { - ++LuaException.SendMsgCount; - LuaException.L = L; - int count = LuaDLL.lua_gettop(L); - - if (count == 2 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - obj.BroadcastMessage(arg0); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 3 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - UnityEngine.SendMessageOptions arg1 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 3); - obj.BroadcastMessage(arg0, arg1); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 3 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - object arg1 = ToLua.ToVarObject(L, 3); - obj.BroadcastMessage(arg0, arg1); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 4 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - object arg1 = ToLua.ToVarObject(L, 3); - UnityEngine.SendMessageOptions arg2 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 4); - obj.BroadcastMessage(arg0, arg1, arg2); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else - { - --LuaException.SendMsgCount; - LuaException.L = L0; - return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.GameObject.BroadcastMessage"); - } - } - catch (Exception e) - { - --LuaException.SendMsgCount; - LuaException.L = L0; - return LuaDLL.toluaL_exception(L, e); + IntPtr L0 = LuaException.L; + + try + { + ++LuaException.SendMsgCount; + LuaException.L = L; + int count = LuaDLL.lua_gettop(L); + + if (count == 2 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + obj.BroadcastMessage(arg0); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 3 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + UnityEngine.SendMessageOptions arg1 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 3); + obj.BroadcastMessage(arg0, arg1); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 3 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + object arg1 = ToLua.ToVarObject(L, 3); + obj.BroadcastMessage(arg0, arg1); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 4 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + object arg1 = ToLua.ToVarObject(L, 3); + UnityEngine.SendMessageOptions arg2 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 4); + obj.BroadcastMessage(arg0, arg1, arg2); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else + { + --LuaException.SendMsgCount; + LuaException.L = L0; + return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.GameObject.BroadcastMessage"); + } + } + catch (Exception e) + { + --LuaException.SendMsgCount; + LuaException.L = L0; + return LuaDLL.toluaL_exception(L, e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int SendMessageUpwards(IntPtr L) { - IntPtr L0 = LuaException.L; - - try - { - ++LuaException.SendMsgCount; - LuaException.L = L; - int count = LuaDLL.lua_gettop(L); - - if (count == 2 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - obj.SendMessageUpwards(arg0); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 3 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - UnityEngine.SendMessageOptions arg1 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 3); - obj.SendMessageUpwards(arg0, arg1); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 3 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - object arg1 = ToLua.ToVarObject(L, 3); - obj.SendMessageUpwards(arg0, arg1); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 4 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - object arg1 = ToLua.ToVarObject(L, 3); - UnityEngine.SendMessageOptions arg2 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 4); - obj.SendMessageUpwards(arg0, arg1, arg2); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else - { - --LuaException.SendMsgCount; - LuaException.L = L0; - return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.GameObject.SendMessageUpwards"); - } - } - catch (Exception e) - { - --LuaException.SendMsgCount; - LuaException.L = L0; - return LuaDLL.toluaL_exception(L, e); + IntPtr L0 = LuaException.L; + + try + { + ++LuaException.SendMsgCount; + LuaException.L = L; + int count = LuaDLL.lua_gettop(L); + + if (count == 2 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + obj.SendMessageUpwards(arg0); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 3 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + UnityEngine.SendMessageOptions arg1 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 3); + obj.SendMessageUpwards(arg0, arg1); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 3 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + object arg1 = ToLua.ToVarObject(L, 3); + obj.SendMessageUpwards(arg0, arg1); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 4 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + object arg1 = ToLua.ToVarObject(L, 3); + UnityEngine.SendMessageOptions arg2 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 4); + obj.SendMessageUpwards(arg0, arg1, arg2); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else + { + --LuaException.SendMsgCount; + LuaException.L = L0; + return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.GameObject.SendMessageUpwards"); + } + } + catch (Exception e) + { + --LuaException.SendMsgCount; + LuaException.L = L0; + return LuaDLL.toluaL_exception(L, e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int SendMessage(IntPtr L) { - IntPtr L0 = LuaException.L; - - try - { - ++LuaException.SendMsgCount; - LuaException.L = L; - int count = LuaDLL.lua_gettop(L); - - if (count == 2 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - obj.SendMessage(arg0); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 3 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - UnityEngine.SendMessageOptions arg1 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 3); - obj.SendMessage(arg0, arg1); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 3 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - object arg1 = ToLua.ToVarObject(L, 3); - obj.SendMessage(arg0, arg1); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else if (count == 4 && TypeChecker.CheckTypes(L, 2)) - { - UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); - string arg0 = ToLua.ToString(L, 2); - object arg1 = ToLua.ToVarObject(L, 3); - UnityEngine.SendMessageOptions arg2 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 4); - obj.SendMessage(arg0, arg1, arg2); - - if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) - { - string error = LuaDLL.lua_tostring(L, -1); - LuaDLL.lua_pop(L, 1); - throw new LuaException(error, LuaException.GetLastError()); - } - - --LuaException.SendMsgCount; - LuaException.L = L0; - return 0; - } - else - { - --LuaException.SendMsgCount; - LuaException.L = L0; - return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.GameObject.SendMessage"); - } - } - catch(Exception e) - { - --LuaException.SendMsgCount; - LuaException.L = L0; - return LuaDLL.toluaL_exception(L, e); + IntPtr L0 = LuaException.L; + + try + { + ++LuaException.SendMsgCount; + LuaException.L = L; + int count = LuaDLL.lua_gettop(L); + + if (count == 2 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + obj.SendMessage(arg0); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 3 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + UnityEngine.SendMessageOptions arg1 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 3); + obj.SendMessage(arg0, arg1); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 3 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + object arg1 = ToLua.ToVarObject(L, 3); + obj.SendMessage(arg0, arg1); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else if (count == 4 && TypeChecker.CheckTypes(L, 2)) + { + UnityEngine.GameObject obj = (UnityEngine.GameObject)ToLua.CheckObject(L, 1, typeof(UnityEngine.GameObject)); + string arg0 = ToLua.ToString(L, 2); + object arg1 = ToLua.ToVarObject(L, 3); + UnityEngine.SendMessageOptions arg2 = (UnityEngine.SendMessageOptions)ToLua.ToObject(L, 4); + obj.SendMessage(arg0, arg1, arg2); + + if (LuaDLL.lua_toboolean(L, LuaDLL.lua_upvalueindex(1))) + { + string error = LuaDLL.lua_tostring(L, -1); + LuaDLL.lua_pop(L, 1); + throw new LuaException(error, LuaException.GetLastError()); + } + + --LuaException.SendMsgCount; + LuaException.L = L0; + return 0; + } + else + { + --LuaException.SendMsgCount; + LuaException.L = L0; + return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.GameObject.SendMessage"); + } + } + catch(Exception e) + { + --LuaException.SendMsgCount; + LuaException.L = L0; + return LuaDLL.toluaL_exception(L, e); } } diff --git a/Assets/Source/Generate/UnityEngine_InputWrap.cs b/Assets/Source/Generate/UnityEngine_InputWrap.cs index e77804916..42b65ea95 100644 --- a/Assets/Source/Generate/UnityEngine_InputWrap.cs +++ b/Assets/Source/Generate/UnityEngine_InputWrap.cs @@ -334,17 +334,17 @@ public class UnityEngine_InputWrap [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int GetTouch(IntPtr L) { - try - { - int arg0 = (int)LuaDLL.luaL_checknumber(L, 1); - int arg1 = LuaDLL.luaL_optinteger(L, 2, TouchBits.ALL); - UnityEngine.Touch o = UnityEngine.Input.GetTouch(arg0); - ToLua.Push(L, o, arg1); - return 1; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e); + try + { + int arg0 = (int)LuaDLL.luaL_checknumber(L, 1); + int arg1 = LuaDLL.luaL_optinteger(L, 2, TouchBits.ALL); + UnityEngine.Touch o = UnityEngine.Input.GetTouch(arg0); + ToLua.Push(L, o, arg1); + return 1; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); } } diff --git a/Assets/Source/Generate/UnityEngine_RectTransformWrap.cs b/Assets/Source/Generate/UnityEngine_RectTransformWrap.cs index e9fb3faca..909cabde9 100644 --- a/Assets/Source/Generate/UnityEngine_RectTransformWrap.cs +++ b/Assets/Source/Generate/UnityEngine_RectTransformWrap.cs @@ -90,13 +90,13 @@ public class UnityEngine_RectTransformWrap { int count = LuaDLL.lua_gettop(L); - if (count == 1) - { - UnityEngine.RectTransform obj = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.Vector3[] arg0 = new UnityEngine.Vector3[4]; - obj.GetLocalCorners(arg0); - ToLua.Push(L, arg0); - return 1; + if (count == 1) + { + UnityEngine.RectTransform obj = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); + UnityEngine.Vector3[] arg0 = new UnityEngine.Vector3[4]; + obj.GetLocalCorners(arg0); + ToLua.Push(L, arg0); + return 1; } else if (count == 2) { @@ -123,13 +123,13 @@ public class UnityEngine_RectTransformWrap { int count = LuaDLL.lua_gettop(L); - if (count == 1) - { - UnityEngine.RectTransform obj = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.Vector3[] arg0 = new UnityEngine.Vector3[4]; - obj.GetWorldCorners(arg0); - ToLua.Push(L, arg0); - return 1; + if (count == 1) + { + UnityEngine.RectTransform obj = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); + UnityEngine.Vector3[] arg0 = new UnityEngine.Vector3[4]; + obj.GetWorldCorners(arg0); + ToLua.Push(L, arg0); + return 1; } else if (count == 2) {