From 163fc67949521b7355a5ffcb43a99b1da03f2c79 Mon Sep 17 00:00:00 2001 From: wsh Date: Wed, 21 May 2025 10:26:04 +0900 Subject: [PATCH] 1 --- Assets/Scenes/pre-0.24.0.unity | 135 ------------------ Assets/Scripts/Panel_ModeControl.cs | 30 ---- Assets/Scripts/Panel_ModeControl.cs.meta | 2 - Assets/Scripts/Preview.meta | 8 ++ .../Scripts/{ => Preview}/Canvas_Component.cs | 0 .../{ => Preview}/Canvas_Component.cs.meta | 0 .../{ => Preview}/ConnectionHandlePoint.cs | 0 .../ConnectionHandlePoint.cs.meta | 0 Assets/Scripts/{ => Studio}/LocationMapper.cs | 0 .../{ => Studio}/LocationMapper.cs.meta | 0 Assets/Scripts/{ => Studio}/Map.cs | 0 Assets/Scripts/{ => Studio}/Map.cs.meta | 0 .../Scripts/Studio/UI/Canvas/Canvas_Static.cs | 2 - 13 files changed, 8 insertions(+), 169 deletions(-) delete mode 100644 Assets/Scripts/Panel_ModeControl.cs delete mode 100644 Assets/Scripts/Panel_ModeControl.cs.meta create mode 100644 Assets/Scripts/Preview.meta rename Assets/Scripts/{ => Preview}/Canvas_Component.cs (100%) rename Assets/Scripts/{ => Preview}/Canvas_Component.cs.meta (100%) rename Assets/Scripts/{ => Preview}/ConnectionHandlePoint.cs (100%) rename Assets/Scripts/{ => Preview}/ConnectionHandlePoint.cs.meta (100%) rename Assets/Scripts/{ => Studio}/LocationMapper.cs (100%) rename Assets/Scripts/{ => Studio}/LocationMapper.cs.meta (100%) rename Assets/Scripts/{ => Studio}/Map.cs (100%) rename Assets/Scripts/{ => Studio}/Map.cs.meta (100%) diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 84ab1646..220b16cc 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -5601,11 +5601,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8505836957447598286, guid: fd428f69696481b45a252d4ae922627b, type: 3} m_PrefabInstance: {fileID: 1229281890} m_PrefabAsset: {fileID: 0} ---- !u!224 &1267680410 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - m_PrefabInstance: {fileID: 4579191816438827957} - m_PrefabAsset: {fileID: 0} --- !u!1 &1287523440 GameObject: m_ObjectHideFlags: 0 @@ -7034,7 +7029,6 @@ RectTransform: - {fileID: 602839464} - {fileID: 1715748516} - {fileID: 2476199971772782488} - - {fileID: 1267680410} m_Father: {fileID: 1981809316} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8107,135 +8101,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1001 &4579191816438827957 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1585135840841040204} - m_Modifications: - - target: {fileID: 1666481472544070126, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_Name - value: Panel_ModeControl - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_SizeDelta.x - value: 100.5155 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_SizeDelta.y - value: 42 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchoredPosition.x - value: 63 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchoredPosition.y - value: -1051 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3438970172250070636, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5554957598861690140, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5554957598861690140, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5554957598861690140, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5554957598861690140, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6635890687411784107, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6635890687411784107, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6635890687411784107, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6635890687411784107, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 50000aa3d37cda040818f88e6af717d3, type: 3} --- !u!1001 &4758802323030175704 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Panel_ModeControl.cs b/Assets/Scripts/Panel_ModeControl.cs deleted file mode 100644 index 37d3c31f..00000000 --- a/Assets/Scripts/Panel_ModeControl.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.UI; -using XRLib.UI; - -namespace Studio.UI -{ - public class Panel_ModeControl : PanelBase - { - Button button_ObjectMode; - Button button_PropertyMode; - public Action onClickObjectMode; - public Action onClickPropertyMode; - public override void AfterAwake() - { - button_ObjectMode.onClick.AddListener(OnClickObjectMode); - button_PropertyMode.onClick.AddListener(OnClickPropertyMode); - } - - private void OnClickPropertyMode() - { - //onClickPropertyMode(); - } - - private void OnClickObjectMode() - { - onClickObjectMode(); - } - } -} diff --git a/Assets/Scripts/Panel_ModeControl.cs.meta b/Assets/Scripts/Panel_ModeControl.cs.meta deleted file mode 100644 index 16b920a6..00000000 --- a/Assets/Scripts/Panel_ModeControl.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 924ac0c6c9fadc24bbb821b72f962fdf \ No newline at end of file diff --git a/Assets/Scripts/Preview.meta b/Assets/Scripts/Preview.meta new file mode 100644 index 00000000..fe5d5b03 --- /dev/null +++ b/Assets/Scripts/Preview.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c19edf74757e6de408b451d8742d01b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Canvas_Component.cs b/Assets/Scripts/Preview/Canvas_Component.cs similarity index 100% rename from Assets/Scripts/Canvas_Component.cs rename to Assets/Scripts/Preview/Canvas_Component.cs diff --git a/Assets/Scripts/Canvas_Component.cs.meta b/Assets/Scripts/Preview/Canvas_Component.cs.meta similarity index 100% rename from Assets/Scripts/Canvas_Component.cs.meta rename to Assets/Scripts/Preview/Canvas_Component.cs.meta diff --git a/Assets/Scripts/ConnectionHandlePoint.cs b/Assets/Scripts/Preview/ConnectionHandlePoint.cs similarity index 100% rename from Assets/Scripts/ConnectionHandlePoint.cs rename to Assets/Scripts/Preview/ConnectionHandlePoint.cs diff --git a/Assets/Scripts/ConnectionHandlePoint.cs.meta b/Assets/Scripts/Preview/ConnectionHandlePoint.cs.meta similarity index 100% rename from Assets/Scripts/ConnectionHandlePoint.cs.meta rename to Assets/Scripts/Preview/ConnectionHandlePoint.cs.meta diff --git a/Assets/Scripts/LocationMapper.cs b/Assets/Scripts/Studio/LocationMapper.cs similarity index 100% rename from Assets/Scripts/LocationMapper.cs rename to Assets/Scripts/Studio/LocationMapper.cs diff --git a/Assets/Scripts/LocationMapper.cs.meta b/Assets/Scripts/Studio/LocationMapper.cs.meta similarity index 100% rename from Assets/Scripts/LocationMapper.cs.meta rename to Assets/Scripts/Studio/LocationMapper.cs.meta diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Studio/Map.cs similarity index 100% rename from Assets/Scripts/Map.cs rename to Assets/Scripts/Studio/Map.cs diff --git a/Assets/Scripts/Map.cs.meta b/Assets/Scripts/Studio/Map.cs.meta similarity index 100% rename from Assets/Scripts/Map.cs.meta rename to Assets/Scripts/Studio/Map.cs.meta diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs index be146bf7..912ce102 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs @@ -12,7 +12,6 @@ namespace Studio.UI public Panel_ShortCuts panel_shortcuts; public Panel_TopBar panel_topbar; public Panel_Toolbar panel_toolbar; - public Panel_ModeControl panel_modecontrol; private void Awake() { @@ -26,7 +25,6 @@ namespace Studio.UI var fbxFileManager = ManagerHub.instance.Get(); var projectManager = ManagerHub.instance.Get(); - panel_modecontrol.onClickObjectMode += () => statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); panel_shortcuts.onClickUndo += CommandInvoker.instance.Undo;