Merge remote-tracking branch 'gitea/master' into thr_dev/dev2
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using XericLibrary.Runtime.MacroLibrary;
|
||||||
using XericUI.XTable.Rendering.Component;
|
using XericUI.XTable.Rendering.Component;
|
||||||
|
|
||||||
namespace XericUIEditor.XTable
|
namespace XericUIEditor.XTable
|
||||||
@@ -47,10 +47,10 @@ namespace XericUIEditor.XTable
|
|||||||
GameObject selected = Selection.activeGameObject;
|
GameObject selected = Selection.activeGameObject;
|
||||||
if (selected == null) return;
|
if (selected == null) return;
|
||||||
|
|
||||||
XericUIActionTable table = selected.GetComponent<XericUIActionTable>();
|
var table = selected.GetComponent<XericUIActionTable>();
|
||||||
if (table == null) return;
|
if (table == null) return;
|
||||||
|
|
||||||
RectTransform rect = table.GetComponent<RectTransform>();
|
var rect = table.RectTransform();
|
||||||
if (rect == null) return;
|
if (rect == null) return;
|
||||||
|
|
||||||
DrawGridOverlay(table, rect);
|
DrawGridOverlay(table, rect);
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ namespace XericUI.XTable.Core
|
|||||||
int endRow = merge.StartRow + merge.RowSpan - 1;
|
int endRow = merge.StartRow + merge.RowSpan - 1;
|
||||||
int endCol = merge.StartCol + merge.ColSpan - 1;
|
int endCol = merge.StartCol + merge.ColSpan - 1;
|
||||||
if (endRow < rows && endCol < cols)
|
if (endRow < rows && endCol < cols)
|
||||||
td.MergeCells(merge.StartRow, merge.StartCol, endRow, endCol);
|
td.MergeCells(merge.StartRow, merge.StartCol, merge.RowSpan, merge.ColSpan);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ using XericLibrary.Runtime.SuperStyleSheet;
|
|||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
#endif
|
#endif
|
||||||
//233333Git666
|
|
||||||
namespace XericUI.XTable.Rendering.Component
|
namespace XericUI.XTable.Rendering.Component
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user