Merge remote-tracking branch 'gitea/master' into thr_dev/dev2

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<XericUIActionTable>();
+			var table = selected.GetComponent<XericUIActionTable>();
 			if (table == null) return;
 
-			RectTransform rect = table.GetComponent<RectTransform>();
+			var rect = table.RectTransform();
 			if (rect == null) return;
 
 			DrawGridOverlay(table, rect);

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);
 					}
 				}
 			}

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
 {
     /// <summary>

~Samples/Example/.sample.json

@@ -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
-}

~Samples/Example/SampleExample.cs

@@ -1,28 +0,0 @@
-// -----------------------------------------------------------------------------
-//
-// Use this sample example C# file to develop samples to guide usage of APIs
-// in your package.
-//
-// -----------------------------------------------------------------------------
-
-namespace Lrss3.Xericuiactionvessel
-{
-    /// <summary>
-    /// Provide a general description of the public class.
-    /// </summary>
-    /// <remarks>
-    /// Packages require XmlDoc documentation for ALL Package APIs.
-    /// https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments
-    /// </remarks>
-    public class MyPublicSampleExampleClass
-    {
-        /// <summary>
-        /// Provide a description of what this public method does.
-        /// </summary>
-        public void CountThingsAndDoStuffAndOutputIt()
-        {
-            var result = new MyPublicRuntimeExampleClass().CountThingsAndDoStuff(1, 2, false);
-            Debug.Log("Call CountThingsAndDoStuffAndOutputIt returns " + result);
-        }
-    }
-}