diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta deleted file mode 100644 index 1eadf09..0000000 --- a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f597f19f656ba56eae4f6a3a7cc528f4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta deleted file mode 100644 index f073d2a..0000000 --- a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 48e08dc33330d11e9d4a1b246c52e4f6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta deleted file mode 100644 index 130722a..0000000 --- a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed09910c0094cb27be8f3ca264680da3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta deleted file mode 100644 index f9b8ed8..0000000 --- a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index 192e263..c333322 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -402,8 +402,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 545e1bf40c968b94d94dbd234fe1e530, type: 3} m_Name: m_EditorClassIdentifier: - ClickSprite: {fileID: 21300000, guid: 79f9b1d682f470f40ab600dade2c369d, type: 3} - OnClickSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3} + ExpandSprite: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3} + CollapseSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3} --- !u!1 &4240480582127588975 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/SandBox/TestUIPanelScenes/UI_MenuBar.unity b/Assets/SandBox/TestUIPanelScenes/UI_MenuBar.unity index db116cd..b340536 100644 --- a/Assets/SandBox/TestUIPanelScenes/UI_MenuBar.unity +++ b/Assets/SandBox/TestUIPanelScenes/UI_MenuBar.unity @@ -504,74 +504,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 746901667} m_Modifications: - - target: {fileID: 1032674806562967849, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1032674806562967849, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1032674806562967849, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1032674806562967849, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2676632071192195886, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2676632071192195886, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2676632071192195886, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2676632071192195886, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3115423825983223177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3115423825983223177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3115423825983223177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3115423825983223177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4158635166661152314, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} propertyPath: m_Name value: UI_MenuBar objectReference: {fileID: 0} - - target: {fileID: 4211880570029202177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4211880570029202177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4211880570029202177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4211880570029202177, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5197371686436935993, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} propertyPath: m_Pivot.x value: 1 @@ -656,45 +592,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6115547779460680530, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6115547779460680530, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6115547779460680530, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6115547779460680530, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7745588582857694484, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7745588582857694484, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7745588582857694484, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7745588582857694484, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8743376772321852980, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: ExpandSprite - value: - objectReference: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3} - - target: {fileID: 8743376772321852980, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} - propertyPath: CollapseSprite - value: - objectReference: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 428a39dea27f1fc45acddfd41e0f6765, type: 3} diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index 66c4d1b..0d85e45 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -50,12 +50,12 @@ public class UI_MenuBar : BasePanel switch (btnName) { case "CloseDefaultBtn": - GetControl("UI_MenuBar").rectTransform.DOLocalMoveX(960, 0.5f); + transform.DOLocalMoveX(960, 0.5f); GetControl("CloseDefaultBtn").sprite = CollapseSprite; - if (GetControl("UI_MenuBar").rectTransform.localPosition.x == 960) + if (transform.localPosition.x == 960) { GetControl("CloseDefaultBtn").sprite = ExpandSprite; - GetControl("UI_MenuBar").rectTransform.DOLocalMoveX(1070, 0.5f); + transform.DOLocalMoveX(1070, 0.5f); } break;