Merge branch 'main' of http://220.90.135.190:3000/UVCXR/Studio

2025-05-29 01:42:01 +09:00
parent f34ef67afe 34c689ded1
commit 45d207e335
2 changed files with 106 additions and 157 deletions
--- a/Assets/Scenes/pre-0.24.0.unity
+++ b/Assets/Scenes/pre-0.24.0.unity
@@ -2998,10 +2998,10 @@ RectTransform:
  - {fileID: 663673411}
  - {fileID: 235881574}
  - {fileID: 434723664}
-  - {fileID: 890605516}
  - {fileID: 1949998714}
  - {fileID: 1291368617}
  - {fileID: 783209398}
+  - {fileID: 571690946}
  - {fileID: 2113204526}
  - {fileID: 1523668493}
  - {fileID: 6877782817204804254}
@@ -3193,6 +3193,108 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  AGVMoveSpeed: 0.3
  AGVRotateSpeed: 0.15
+--- !u!1001 &571690945
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 545811781}
+    m_Modifications:
+    - target: {fileID: 3106101528242001925, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_Name
+      value: Panel_AssetSetting
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 620
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 590
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 960
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -545
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+--- !u!224 &571690946 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6258750310946521674, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
+  m_PrefabInstance: {fileID: 571690945}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &574297194
 GameObject:
  m_ObjectHideFlags: 0
@@ -4292,11 +4394,6 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 943011681277070845, guid: 8c7d27dfc5a4df745bb492f645ef8a91, type: 3}
  m_PrefabInstance: {fileID: 6047633174962386497}
  m_PrefabAsset: {fileID: 0}
--- !u!224 &890605516 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-  m_PrefabInstance: {fileID: 2098517381}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &916751973
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -11282,155 +11379,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  currentMode: 0
--- !u!1001 &2098517381
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 545811781}
-    m_Modifications:
-    - target: {fileID: 247621717870717963, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 247621717870717963, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 247621717870717963, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 247621717870717963, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3106101528242001925, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_Name
-      value: Panel_AssetSetting
-      objectReference: {fileID: 0}
-    - target: {fileID: 3106101528242001925, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3385183036013514552, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3385183036013514552, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3385183036013514552, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3385183036013514552, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4511214995064534852, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4511214995064534852, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4511214995064534852, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4511214995064534852, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 620
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 590
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 960
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -545
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6258750310946521674, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
 --- !u!224 &2109910251 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 6366813177479495702, guid: f931459c154b09e4c98ab9a5082560e6, type: 3}
--- a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs
+++ b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs
@@ -38,6 +38,7 @@ namespace Studio.UI
        private float ratio;
        public Action onClose;
        public Button Button_Close;
+        private string defaultPath = $"C:\\Users\\{Environment.UserName}";

        public void Active(bool isActive)
        {
@@ -98,7 +99,7 @@ namespace Studio.UI
        private void OnClickImageSelectedButton()
        {
            var extensions = new[] { new ExtensionFilter("Image Files", "png", "jpg", "jpeg") };
-            StandaloneFileBrowser.OpenFilePanelAsync("이미지 열기", "", extensions, false, LoadImage);
+            StandaloneFileBrowser.OpenFilePanelAsync("이미지 열기", defaultPath, extensions, false, LoadImage);
        }
        private void OnAutoStartValuedChanged(bool isOn)
        {
@@ -106,7 +107,7 @@ namespace Studio.UI
        }
        private void OnClickLanguagePackButton()
        {
-            var packItem = StandaloneFileBrowser.OpenFilePanel("언어 팩 열기", "", "", false);
+            var packItem = StandaloneFileBrowser.OpenFilePanel("언어 팩 열기", defaultPath, "", false);

            if (packItem != null && packItem.Count > 0)
            {