|
|
@@ -129,7 +129,7 @@ namespace QFramework
|
|
|
SetData(m_ToolConfigProxy.m_TmpToolRoomConfigInfos);
|
|
|
break;
|
|
|
case ToolLibraryType.ToolKit:
|
|
|
- SetData(m_ToolConfigProxy.GetAllToolConfigInfoFromCTRSTCIs());
|
|
|
+ SetData(m_ToolConfigProxy.GetAllToolConfigInfoFromCTRSTCIs());
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
@@ -176,7 +176,7 @@ namespace QFramework
|
|
|
|
|
|
for (int i = 0; i < GetToolCountOfCureentPage(page); i++)
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
ToolConfigInfo tmpToolConfigInfo = m_ToolConfigInfos[(page - 1) * 18 + i];
|
|
|
|
|
|
toolItemPrefabs[i].gameObject.SetActive(true);
|
|
|
@@ -203,7 +203,7 @@ namespace QFramework
|
|
|
case ToolLibraryType.ToolRoom:
|
|
|
|
|
|
m_ToolConfigInfos = toolConfigProxy.GetToolConfigInfosByToolTypeAndName(UIKit.GetPanel<ToolLibraryForm>().ToolTypeElement.curentType, inputStr);
|
|
|
-
|
|
|
+
|
|
|
break;
|
|
|
case ToolLibraryType.ToolKit:
|
|
|
|
|
|
@@ -262,9 +262,18 @@ namespace QFramework
|
|
|
|
|
|
private void SetPagePoint(int page)
|
|
|
{
|
|
|
- if (page > 6 || page < 1) return;
|
|
|
+ if (page < 1) return;
|
|
|
+
|
|
|
+ if(GetPageCount() > PagePoint.transform.childCount)
|
|
|
+ {
|
|
|
+ for (int i = PagePoint.transform.childCount; i <= GetPageCount(); i++)
|
|
|
+ {
|
|
|
+ GameObject childPagePoint = GameObject.Instantiate(PagePoint.transform.GetChild(0).gameObject,PagePoint.transform);
|
|
|
+ childPagePoint.transform.SetAsLastSibling();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- for (int i = 0; i < 6; i++)
|
|
|
+ for (int i = 0; i < PagePoint.transform.childCount; i++)
|
|
|
{
|
|
|
PagePoint.transform.GetChild(i).gameObject.SetActive(false);
|
|
|
PagePoint.transform.GetChild(i).Find("Hight").gameObject.SetActive(false);
|