From 8d21e5647b6c117e4b666716b88d4f1f6dd0fb14 Mon Sep 17 00:00:00 2001 From: yzx Date: Tue, 25 Jun 2024 09:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/Prefabs/APP.prefab | 3 +-- .../Assets/Scenes/Start.unity | 4 ++++ .../Assets/Scripts/ProcessMode/ActionWithDescription.cs | 4 ++-- .../ProjectSettings/PackageManagerSettings.asset | 6 +++--- .../ProjectSettings/ProjectVersion.txt | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab index a5e40fe7..c6c47721 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab @@ -522,12 +522,12 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3069805421785455384} - {fileID: 1749552120815238681} - {fileID: 2264434391528534163} - {fileID: 8014322703218229613} - {fileID: 7642526006322022173} - {fileID: 3097030627198115247} - - {fileID: 3069805421785455384} - {fileID: 9018075082424182618} - {fileID: 6780964861112113625} - {fileID: 3705230318444186014} @@ -2535,7 +2535,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9285dff9c8040aa4488bf8974674f237, type: 3} m_Name: m_EditorClassIdentifier: - SimulationOnEditor: 1 sceneName: --- !u!1 &6053353591068959239 GameObject: diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity index 7bb1702a..1c6fe555 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity @@ -227,6 +227,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -289 objectReference: {fileID: 0} + - target: {fileID: 3069805421785455384, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_AnchoredPosition.y + value: -219 + objectReference: {fileID: 0} - target: {fileID: 3097030627198115247, guid: fa12b84946083d14cb4447029910be28, type: 3} propertyPath: m_Pivot.x value: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ActionWithDescription.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ActionWithDescription.cs index 37bf540c..9487a369 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ActionWithDescription.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ActionWithDescription.cs @@ -14,8 +14,8 @@ namespace DefaultNamespace.ProcessMode public int CurrentObjectIndex { get; set; } // 当前对象的点击索引,仅用于按顺序点击的情况 public bool FeedbackDisplayed { get; set; } // 是否已经显示过反馈 public string StepDescription { get; set; } - - + + public ActionWithDescription(List targetObjects, Action action, string description, bool isSequential, string stepDescription) { TargetObjects = targetObjects ?? new List(); diff --git a/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset b/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset index e6641787..34a728fb 100644 --- a/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset +++ b/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.cn + m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -850 - m_OriginalInstanceId: -852 + m_UserModificationsInstanceId: -830 + m_OriginalInstanceId: -832 m_LoadAssets: 0 diff --git a/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt b/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt index 1cf12ebb..c47c8be7 100644 --- a/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt +++ b/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.22f1c1 -m_EditorVersionWithRevision: 2022.3.22f1c1 (c3cbd310e76e) +m_EditorVersion: 2022.3.22f1 +m_EditorVersionWithRevision: 2022.3.22f1 (887be4894c44)