diff --git a/Editor/XTable/XTableEditorOverlay.cs b/Editor/XTable/XTableEditorOverlay.cs index 27b632a..0a1764a 100644 --- a/Editor/XTable/XTableEditorOverlay.cs +++ b/Editor/XTable/XTableEditorOverlay.cs @@ -3,7 +3,7 @@ using UnityEditor; using UnityEngine; - +using XericLibrary.Runtime.MacroLibrary; using XericUI.XTable.Rendering.Component; namespace XericUIEditor.XTable @@ -47,10 +47,10 @@ namespace XericUIEditor.XTable GameObject selected = Selection.activeGameObject; if (selected == null) return; - XericUIActionTable table = selected.GetComponent(); + var table = selected.GetComponent(); if (table == null) return; - RectTransform rect = table.GetComponent(); + var rect = table.RectTransform(); if (rect == null) return; DrawGridOverlay(table, rect); diff --git a/Runtime/XTable/Core/XTableClipboardData.cs b/Runtime/XTable/Core/XTableClipboardData.cs index ab5466c..9baafe2 100644 --- a/Runtime/XTable/Core/XTableClipboardData.cs +++ b/Runtime/XTable/Core/XTableClipboardData.cs @@ -168,7 +168,7 @@ namespace XericUI.XTable.Core int endRow = merge.StartRow + merge.RowSpan - 1; int endCol = merge.StartCol + merge.ColSpan - 1; if (endRow < rows && endCol < cols) - td.MergeCells(merge.StartRow, merge.StartCol, endRow, endCol); + td.MergeCells(merge.StartRow, merge.StartCol, merge.RowSpan, merge.ColSpan); } } } diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.cs index 31876d1..18a4444 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.cs @@ -12,7 +12,7 @@ using XericLibrary.Runtime.SuperStyleSheet; #if UNITY_EDITOR using UnityEditor; #endif -//233333Git666 + namespace XericUI.XTable.Rendering.Component { /// diff --git a/~Samples/Example/.sample.json b/~Samples/Example/.sample.json deleted file mode 100644 index 3b43eaf..0000000 --- a/~Samples/Example/.sample.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "displayName":"Example Sample", - "description": "Replace this string with your own description of the sample. Delete the Samples folder if not needed.", - "createSeparatePackage": false -} diff --git a/~Samples/Example/SampleExample.cs b/~Samples/Example/SampleExample.cs deleted file mode 100644 index adc78c6..0000000 --- a/~Samples/Example/SampleExample.cs +++ /dev/null @@ -1,28 +0,0 @@ -// ----------------------------------------------------------------------------- -// -// Use this sample example C# file to develop samples to guide usage of APIs -// in your package. -// -// ----------------------------------------------------------------------------- - -namespace Lrss3.Xericuiactionvessel -{ - /// - /// Provide a general description of the public class. - /// - /// - /// Packages require XmlDoc documentation for ALL Package APIs. - /// https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments - /// - public class MyPublicSampleExampleClass - { - /// - /// Provide a description of what this public method does. - /// - public void CountThingsAndDoStuffAndOutputIt() - { - var result = new MyPublicRuntimeExampleClass().CountThingsAndDoStuff(1, 2, false); - Debug.Log("Call CountThingsAndDoStuffAndOutputIt returns " + result); - } - } -} \ No newline at end of file