From 0df3594f9406a5cbfe18b65e1d9321a5401a959f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=98=81=EB=AF=BC?= <117150306+jym04@users.noreply.github.com> Date: Thu, 29 May 2025 02:50:23 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=ED=83=90=EC=83=89?= =?UTF-8?q?=EA=B8=B0=20=EC=82=AC=EC=9A=A9=20=EC=8B=9C=EC=9D=98=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EA=B2=BD=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Studio/Common/OptionURL.cs | 10 ++++++++++ Assets/Scripts/Studio/Common/OptionURL.cs.meta | 2 ++ .../Studio/TwinObject/StaticObject/StackerCrane.cs | 8 +++----- .../Scripts/Studio/UI/Elements/UI_FolderPathItem.cs | 3 +-- Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs | 5 ++--- .../UI/Panel/Panel_MultilingualSettingModal.cs | 3 +-- .../Scripts/Studio/UI/Panel/Panel_NewProjectInfo.cs | 6 ++---- .../Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs | 3 +-- .../Studio/UI/Panel/Panel_TopMenuNewProjectInfo.cs | 6 ++++-- .../Studio/UI/Panel/Panel_TopMenuOpenProjectInfo.cs | 3 +-- .../Build Profiles/New Windows Profile 1.asset | 2 +- Assets/URPSetting/ISURP_GlobalSettings.asset | 12 +++++++++++- 12 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 Assets/Scripts/Studio/Common/OptionURL.cs create mode 100644 Assets/Scripts/Studio/Common/OptionURL.cs.meta diff --git a/Assets/Scripts/Studio/Common/OptionURL.cs b/Assets/Scripts/Studio/Common/OptionURL.cs new file mode 100644 index 00000000..257ca728 --- /dev/null +++ b/Assets/Scripts/Studio/Common/OptionURL.cs @@ -0,0 +1,10 @@ +using System; +using UnityEngine; + +namespace Studio +{ + public class OptionURL + { + internal static string defaultPath = $"C:\\Users\\{Environment.UserName}"; + } +} diff --git a/Assets/Scripts/Studio/Common/OptionURL.cs.meta b/Assets/Scripts/Studio/Common/OptionURL.cs.meta new file mode 100644 index 00000000..79c3dada --- /dev/null +++ b/Assets/Scripts/Studio/Common/OptionURL.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e6d98f9c6f0b57a4baa2db43e9a75c3f \ No newline at end of file diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs index 5aa87fcc..44145276 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs @@ -1,19 +1,17 @@ using Studio.AssetTool; using Studio.Manage; -using Studio.VirtualFactory.Info; using System; using System.Collections; using System.Collections.Generic; using System.Linq; using Unity.Mathematics; -using UnityEditor.Build; using UnityEngine; namespace Studio.Staic.STKC { public class StackerCrane : AbstractFunctionObject { - private Dictionary CurrentEntity; + private Dictionary CurrentEntity; public override Dictionary Info { get @@ -72,7 +70,7 @@ namespace Studio.Staic.STKC } public void OnPlayStart() { - if(isfirstStart ==false) + if (isfirstStart == false) startPos = transform.position.z; isfirstStart = true; var type = GetComponent().topic; @@ -189,6 +187,6 @@ namespace Studio.Staic.STKC onMotionStart -= StartAnim; } - + } } diff --git a/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs b/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs index 7d9e5576..2dc895ab 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs @@ -13,7 +13,6 @@ namespace Studio.UI private Button Button_SelectedFolder; public Action onEndEditInputFieldURL; - private string defaultPath = $"C:\\Users\\{Environment.UserName}"; public override void AfterAwake() { @@ -34,7 +33,7 @@ namespace Studio.UI } private void OnClickSelectedFolderButton() { - var paths = StandaloneFileBrowser.OpenFolderPanel("Select AssetsFolder", defaultPath, false); + var paths = StandaloneFileBrowser.OpenFolderPanel("Select AssetsFolder", "", false); if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name)) { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs index 53c2ab8a..33ba96a1 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs @@ -38,7 +38,6 @@ 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) { @@ -99,7 +98,7 @@ namespace Studio.UI private void OnClickImageSelectedButton() { var extensions = new[] { new ExtensionFilter("Image Files", "png", "jpg", "jpeg") }; - StandaloneFileBrowser.OpenFilePanelAsync("À̹ÌÁö ¿­±â", defaultPath, extensions, false, LoadImage); + StandaloneFileBrowser.OpenFilePanelAsync("À̹ÌÁö ¿­±â", "", extensions, false, LoadImage); } private void OnAutoStartValuedChanged(bool isOn) { @@ -107,7 +106,7 @@ namespace Studio.UI } private void OnClickLanguagePackButton() { - var packItem = StandaloneFileBrowser.OpenFilePanel("¾ð¾î ÆÑ ¿­±â", defaultPath, "", false); + var packItem = StandaloneFileBrowser.OpenFilePanel("¾ð¾î ÆÑ ¿­±â", "", "", false); if (packItem != null && packItem.Count > 0) { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_MultilingualSettingModal.cs b/Assets/Scripts/Studio/UI/Panel/Panel_MultilingualSettingModal.cs index 1a4bfcaf..9fb4327b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_MultilingualSettingModal.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_MultilingualSettingModal.cs @@ -28,7 +28,6 @@ namespace Studio.UI private Dictionary languages = new Dictionary(); private string json; public string saveLanguage; - private string defaultPath = $"C:\\Users\\{Environment.UserName}"; public override void AfterAwake() { @@ -39,7 +38,7 @@ namespace Studio.UI } void OnClickOpenFileButton() { - StandaloneFileBrowser.OpenFilePanelAsync("Open File", defaultPath, "json", false, LoadJson); + StandaloneFileBrowser.OpenFilePanelAsync("Open File", "", "json", false, LoadJson); } void OnClickSaveButton() { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_NewProjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_NewProjectInfo.cs index 3e2cdcf8..736aa78b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_NewProjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_NewProjectInfo.cs @@ -22,19 +22,17 @@ namespace Studio.UI public Action onClickFileExplorer; public Action onClickCreate; - private string defaultPath = $"C:\\Users\\{Environment.UserName}"; - public override void AfterAwake() { Button_FileExplorer.onClick.AddListener(OnClickFileExplorer); Button_Create.onClick.AddListener(OnClickCreate); - InputField_ProjectRoute.text = defaultPath; + InputField_ProjectRoute.text = OptionURL.defaultPath; } private void OnClickFileExplorer() { - var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", defaultPath, false); + var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false); if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name)) { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs index 5d852cb9..f3c929ef 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_OpenProjectInfo.cs @@ -30,7 +30,6 @@ namespace Studio.UI public Button Button_Open; public Action onClickOpen; - private string defaultPath = $"C:\\Users\\{Environment.UserName}"; public override void AfterAwake() { @@ -77,7 +76,7 @@ namespace Studio.UI private void OnClickFileExplorer() { - var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", defaultPath, "ocs", false); + var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", "", "ocs", false); if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name)) { diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuNewProjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuNewProjectInfo.cs index 104a468f..0e7144d1 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuNewProjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuNewProjectInfo.cs @@ -18,7 +18,6 @@ namespace Studio.UI public Button Button_Close; public Action onClickCreate; - private string defaultPath = $"C:\\Users\\{Environment.UserName}"; public override void AfterAwake() { @@ -29,7 +28,7 @@ namespace Studio.UI } private void OnClickFileExplorer() { - var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", defaultPath, false); + var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false); if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name)) { @@ -53,6 +52,9 @@ namespace Studio.UI public void Open() { SetActive(true); + + InputField_ProjectName.text = string.Empty; + InputField_ProjectRoute.text = OptionURL.defaultPath; } public void Close() diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuOpenProjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuOpenProjectInfo.cs index f0fffbf6..e9d589ed 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuOpenProjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_TopMenuOpenProjectInfo.cs @@ -17,7 +17,6 @@ namespace Studio.UI public Button Button_Close; public Action onClickOpen; - private string defaultPath = $"C:\\Users\\{Environment.UserName}"; public override void AfterAwake() { @@ -28,7 +27,7 @@ namespace Studio.UI } private void OnClickFileExplorer() { - var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", defaultPath, "ocs", false); + var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", "", "ocs", false); if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name)) { diff --git a/Assets/Settings/Build Profiles/New Windows Profile 1.asset b/Assets/Settings/Build Profiles/New Windows Profile 1.asset index a8d923f9..6ffbabf3 100644 --- a/Assets/Settings/Build Profiles/New Windows Profile 1.asset +++ b/Assets/Settings/Build Profiles/New Windows Profile 1.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_OverrideGlobalSceneList: 1 m_Scenes: - m_enabled: 1 - m_path: Assets/Scenes/New Scene.unity + m_path: Assets/Scenes/pre-0.24.0.unity m_ScriptingDefines: [] m_PlayerSettingsYaml: m_Settings: diff --git a/Assets/URPSetting/ISURP_GlobalSettings.asset b/Assets/URPSetting/ISURP_GlobalSettings.asset index cba22bc2..8cb3bd4d 100644 --- a/Assets/URPSetting/ISURP_GlobalSettings.asset +++ b/Assets/URPSetting/ISURP_GlobalSettings.asset @@ -56,7 +56,17 @@ MonoBehaviour: - rid: 4833515143083327508 - rid: 2393467941640208635 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 4833515143083327490 + - rid: 4833515143083327492 + - rid: 4833515143083327494 + - rid: 4833515143083327495 + - rid: 4833515143083327496 + - rid: 4833515143083327497 + - rid: 4833515143083327499 + - rid: 4833515143083327501 + - rid: 4833515143083327505 + - rid: 4833515143083327508 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: