From 4818929da0cda63e7be238c65f307c18f6e75d0d Mon Sep 17 00:00:00 2001 From: yzx Date: Mon, 3 Jun 2024 20:43:51 +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 --- .../.idea/encodings.xml | 1 + .../Assembly-CSharp-Editor.csproj | 10 +- .../Assembly-CSharp-firstpass.csproj | 6 +- .../Assembly-CSharp.csproj | 7 +- .../Assets/Framework/GameLauncher.cs | 2 +- .../Assets/Resources/Prefabs/APP.prefab | 321 ++++++++++++++++++ .../Assets/Resources/Prefabs/APP.prefab.meta | 7 + .../Window/ToolsPack/ToolsPackWindow.prefab | 133 ++++++++ .../ToolsPack/ToolsPackWindowItemBt.prefab | 3 +- .../Assets/Scenes/Start.unity | 276 ++++++++++++++- .../Assets/Scenes/工具间Scenes/工具间.unity | 259 ++++++-------- .../Scripts/ToolsPack/ToolsPackManager.cs | 32 +- .../ToolsPackWindowItemBtComponent.cs | 23 +- .../ToolsPack/ToolsPackWindowManager.cs | 1 + .../Assets/Scripts/ToolsPackSceneManager.cs | 17 + .../Scripts/ToolsPackSceneManager.cs.meta | 3 + .../MotionFramework.csproj | 10 +- .../NaughtyAttributes.Core.csproj | 10 +- .../NaughtyAttributes.Editor.csproj | 10 +- .../NaughtyAttributes.Test.csproj | 10 +- .../UniTask.Addressables.csproj | 10 +- .../UniTask.DOTween.csproj | 10 +- .../UniTask.Editor.csproj | 10 +- .../UniTask.Linq.csproj | 12 +- .../UniTask.TextMeshPro.csproj | 10 +- .../UniTask.csproj | 10 +- 26 files changed, 979 insertions(+), 224 deletions(-) create mode 100644 SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab create mode 100644 SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab.meta create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ToolsPackSceneManager.cs create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ToolsPackSceneManager.cs.meta diff --git a/SXElectricityInformationAcquisition/.idea/.idea.SXElectricityInformationAcquisition/.idea/encodings.xml b/SXElectricityInformationAcquisition/.idea/.idea.SXElectricityInformationAcquisition/.idea/encodings.xml index 684b90a8..f4064ea2 100644 --- a/SXElectricityInformationAcquisition/.idea/.idea.SXElectricityInformationAcquisition/.idea/encodings.xml +++ b/SXElectricityInformationAcquisition/.idea/.idea.SXElectricityInformationAcquisition/.idea/encodings.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj index aaedd523..950aaa92 100644 --- a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj +++ b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj @@ -325,20 +325,20 @@ E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\Dependencies\DotNetZip\Unity.VisualScripting.IonicZip.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\Editor\DOTweenEditor.dll + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\Editor\DOTweenEditor.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp-firstpass.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp-firstpass.csproj index 79c6c3f2..9f160faf 100644 --- a/SXElectricityInformationAcquisition/Assembly-CSharp-firstpass.csproj +++ b/SXElectricityInformationAcquisition/Assembly-CSharp-firstpass.csproj @@ -311,12 +311,12 @@ E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll + E:\Program Files\Unity 2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj index 6a91739c..26c83356 100644 --- a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj +++ b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj @@ -57,6 +57,7 @@ + @@ -345,12 +346,12 @@ E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Library\PackageCache\com.unity.visualscripting@1.9.2\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll - - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll - E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\DOTween\DOTween.dll + + E:\Unity Projects\GitLab\2024\ShanxiKnowledgeBase\SXElectricityInformationAcquisition\Assets\Plugins\Newtonsoft\Newtonsoft.Json.dll + E:\Program Files\Unity 2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll diff --git a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs index 4780296e..c0acfb87 100644 --- a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs @@ -37,7 +37,7 @@ public class GameLauncher : MonoBehaviour CreateGameModules(); - // SceneManager.LoadScene("߼"); + //SceneManager.LoadScene("߼"); } void Update() { diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab new file mode 100644 index 00000000..c6b7533e --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab @@ -0,0 +1,321 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2254929100106748975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 178020885541006542} + - component: {fileID: 1925723017623505205} + - component: {fileID: 8119939561368072965} + - component: {fileID: 6252209564208501557} + m_Layer: 0 + m_Name: UICanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &178020885541006542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2254929100106748975} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6780964861112113625} + m_Father: {fileID: 1091812145067508994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &1925723017623505205 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2254929100106748975} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &8119939561368072965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2254929100106748975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &6252209564208501557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2254929100106748975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6026879024415736155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1091812145067508994} + - component: {fileID: 3598037006673712039} + m_Layer: 0 + m_Name: APP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1091812145067508994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6026879024415736155} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 178020885541006542} + - {fileID: 3636447378478800592} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3598037006673712039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6026879024415736155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9285dff9c8040aa4488bf8974674f237, type: 3} + m_Name: + m_EditorClassIdentifier: + SimulationOnEditor: 1 +--- !u!1 &6365669947511818487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3636447378478800592} + - component: {fileID: 6714226909145782126} + - component: {fileID: 7886658266029284616} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3636447378478800592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365669947511818487} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1091812145067508994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6714226909145782126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365669947511818487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!114 &7886658266029284616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365669947511818487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!1001 &7728718399313411534 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 178020885541006542} + m_Modifications: + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchoredPosition.x + value: 208 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchoredPosition.y + value: 131 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668293590267392201, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_Name + value: ToolsPackMenuButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a274f0401c998f044950f6e58c63fcec, type: 3} +--- !u!224 &6780964861112113625 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + m_PrefabInstance: {fileID: 7728718399313411534} + m_PrefabAsset: {fileID: 0} diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab.meta b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab.meta new file mode 100644 index 00000000..1f1115d4 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fa12b84946083d14cb4447029910be28 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab index 3648ed66..b91b4355 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab @@ -270,6 +270,7 @@ RectTransform: m_Children: - {fileID: 8046699651749414086} - {fileID: 6554520172130113965} + - {fileID: 3137108634476030791} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -767,6 +768,138 @@ MonoBehaviour: m_Spacing: {x: 21, y: 21} m_Constraint: 1 m_ConstraintCount: 8 +--- !u!1 &7203585046012487069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3137108634476030791} + - component: {fileID: 3651227873024082082} + - component: {fileID: 3390404511704854341} + - component: {fileID: 6478654012746062064} + m_Layer: 5 + m_Name: Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3137108634476030791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7203585046012487069} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8964327404230383853} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 462.62, y: 244.1} + m_SizeDelta: {x: 71.1145, y: 70.6333} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3651227873024082082 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7203585046012487069} + m_CullTransparentMesh: 1 +--- !u!114 &3390404511704854341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7203585046012487069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6478654012746062064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7203585046012487069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3390404511704854341} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1904356175466579457} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &7628180128001829456 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab index 2e7a56e7..10877328 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindowItemBt.prefab @@ -100,7 +100,7 @@ RectTransform: m_GameObject: {fileID: 2129228580697719086} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.81438, y: 0.81438, z: 0.81438} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 634249328724278198} @@ -328,3 +328,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ico: {fileID: 1259292961442234839} + closeBt: {fileID: 2129228580697719086} diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity index 7e82f9a7..ee4dd3fd 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity @@ -123,6 +123,278 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &55676139 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 474542935} + m_Modifications: + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchoredPosition.x + value: 208 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_AnchoredPosition.y + value: 131 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5668293590267392201, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + propertyPath: m_Name + value: ToolsPackMenuButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a274f0401c998f044950f6e58c63fcec, type: 3} +--- !u!224 &55676140 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} + m_PrefabInstance: {fileID: 55676139} + m_PrefabAsset: {fileID: 0} +--- !u!1 &327842030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 327842031} + - component: {fileID: 327842033} + - component: {fileID: 327842032} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &327842031 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327842030} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 660849474} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &327842032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327842030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &327842033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327842030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!1 &474542934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 474542935} + - component: {fileID: 474542938} + - component: {fileID: 474542937} + - component: {fileID: 474542936} + m_Layer: 0 + m_Name: UICanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &474542935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474542934} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 55676140} + m_Father: {fileID: 660849474} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &474542936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474542934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &474542937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474542934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &474542938 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474542934} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &660849473 GameObject: m_ObjectHideFlags: 0 @@ -152,7 +424,9 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 474542935} + - {fileID: 327842031} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &660849475 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity index c24da5e2..917d2cb3 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity @@ -502,6 +502,51 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496101574} m_Mesh: {fileID: -4545423930167495100, guid: 156cca832bad49447b16a92685b1fa5b, type: 3} +--- !u!1 &505215068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505215069} + - component: {fileID: 505215070} + m_Layer: 0 + m_Name: APP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &505215069 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505215068} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 770.37103, y: 601.83936, z: -115.089966} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &505215070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505215068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63b7e72fa2d34c0ca56c938039f733e2, type: 3} + m_Name: + m_EditorClassIdentifier: + toolsPackScene: 0 --- !u!1 &569542176 GameObject: m_ObjectHideFlags: 0 @@ -680,8 +725,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 680857422} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -689,108 +733,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &680857421 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 587418715} - m_Modifications: - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_SizeDelta.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_SizeDelta.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_AnchoredPosition.x - value: 280 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_AnchoredPosition.y - value: 85 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5668293590267392201, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - propertyPath: m_Name - value: ToolsPackMenuButton - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a274f0401c998f044950f6e58c63fcec, type: 3} ---- !u!224 &680857422 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3} - m_PrefabInstance: {fileID: 680857421} - m_PrefabAsset: {fileID: 0} --- !u!1 &693294531 GameObject: m_ObjectHideFlags: 0 @@ -1064,51 +1006,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756157321} m_Mesh: {fileID: -7434549690534084444, guid: 156cca832bad49447b16a92685b1fa5b, type: 3} ---- !u!1 &906925292 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 906925294} - - component: {fileID: 906925293} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &906925293 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 906925292} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9285dff9c8040aa4488bf8974674f237, type: 3} - m_Name: - m_EditorClassIdentifier: - SimulationOnEditor: 1 ---- !u!4 &906925294 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 906925292} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 264.44464, y: 201.37498, z: -2.3318584} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -2420,6 +2317,67 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!1001 &8696923547104612602 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_Name + value: APP + objectReference: {fileID: 0} + - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa12b84946083d14cb4447029910be28, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2435,5 +2393,6 @@ SceneRoots: - {fileID: 707677811} - {fileID: 587418715} - {fileID: 1810945302} - - {fileID: 906925294} - {fileID: 2108215486} + - {fileID: 8696923547104612602} + - {fileID: 505215069} diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs index 5334f8fc..82da033e 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs @@ -4,19 +4,26 @@ using MotionFramework; using MotionFramework.Scripts.Runtime.Engine.Engine.Network.WebRequest; using UnityEngine; +public enum ToolsPackScene +{ + 工具间, + 其他 +} + /// /// 工具包 /// -public class ToolsPackManager : ModuleSingleton, IModule -{ +public class ToolsPackManager : ModuleSingleton, IModule +{ private Dictionary _toolsPack; private Dictionary _toolsPackWindowBtImage; //工具窗口下的按钮图集 private GameObject _toolsPackWindow; private GameObject _toolsPackWindowBt; private Transform _canvas; - + private GameObject _toolsPackWindowTemp; - + private ToolsPackScene _toolsPackScene; + public void OnCreate(object createParam) { _toolsPack = new Dictionary(); @@ -72,6 +79,7 @@ public class ToolsPackManager : ModuleSingleton, IModule /// public void DeleteToolsPack(string toolsName) { + _toolsPack.Remove(toolsName); } /// @@ -120,17 +128,17 @@ public class ToolsPackManager : ModuleSingleton, IModule { return _toolsPackWindow; } - + public GameObject GetToolsPackWindowBt() { return _toolsPackWindowBt; } - + public GameObject GetToolsPackWindowTemp() { return _toolsPackWindowTemp; } - + public void SetToolsPackWindowTemp(GameObject win) { _toolsPackWindowTemp = win; @@ -140,9 +148,17 @@ public class ToolsPackManager : ModuleSingleton, IModule { if (_canvas == null) { - _canvas = GameObject.Find("Canvas").transform; + _canvas = GameObject.Find("UICanvas").transform; } return _canvas; } + public ToolsPackScene GetToolsPackScene() + { + return _toolsPackScene; + } + public void SetToolsPackScene(ToolsPackScene toolsPackScene) + { + _toolsPackScene = toolsPackScene; + } } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs index 3f8511f0..3c29ab2e 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs @@ -1,4 +1,6 @@ -using MotionFramework; +using System; +using MotionFramework; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; @@ -7,10 +9,29 @@ namespace ToolsPack public class ToolsPackWindowItemBtComponent : MonoBehaviour { [SerializeField] private RawImage ico; + [SerializeField] private GameObject closeBt; + + + private void Start() + { + closeBt.GetComponent