From 10a0e293f57bae86791a0b7fbce587266d44b90b Mon Sep 17 00:00:00 2001 From: taosuqi <2274240467@qq.com> Date: Thu, 20 Jun 2024 09:33:31 +0800 Subject: [PATCH] 1 --- .../Assets/Scenes/现场 _Test.unity | 953 +----------------- .../SXElectricityInformationAcquisition.sln | 109 +- 2 files changed, 78 insertions(+), 984 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity index aafcdf65..90651648 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity @@ -1433,14 +1433,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6121626523118833240} m_Modifications: - - target: {fileID: 362740763354511596, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3375279720214638783, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7324125482692298847, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} propertyPath: m_Name value: "\u7EDD\u7F18\u80F6\u5E26" @@ -1463,7 +1455,6 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} propertyPath: m_LocalPosition.x -<<<<<<< HEAD value: 0.352 objectReference: {fileID: 0} - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} @@ -1489,56 +1480,25 @@ PrefabInstance: - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} propertyPath: m_LocalRotation.z value: 0.49997693 -======= - value: -0.17293397 - objectReference: {fileID: 0} - - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_LocalPosition.y - value: -0.18962604 - objectReference: {fileID: 0} - - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_LocalPosition.z - value: 0.3951867 - objectReference: {fileID: 0} - - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_LocalRotation.w - value: -0.08703536 - objectReference: {fileID: 0} - - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_LocalRotation.x - value: -0.5445232 - objectReference: {fileID: 0} - - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7017299 - objectReference: {fileID: 0} - - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} - propertyPath: m_LocalRotation.z - value: 0.45110387 ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa objectReference: {fileID: 0} - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -147.431 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 46.710007 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7993702416454423269, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} insertIndex: -1 -<<<<<<< HEAD addedObject: {fileID: 1699029880} -======= - addedObject: {fileID: 1129396990} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7324125482692298847, guid: a6c750f9e3102bc499c6f13f30606383, type: 3} insertIndex: -1 @@ -4460,123 +4420,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 251008410} m_CullTransparentMesh: 1 ---- !u!1001 &255406705 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 676339782} - m_Modifications: - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7059219998895239338, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8460126229225677331, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Name - value: Canvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} ---- !u!224 &255406706 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 255406705} - m_PrefabAsset: {fileID: 0} ---- !u!114 &255406707 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6493708998332797694, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 255406705} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &256534353 GameObject: m_ObjectHideFlags: 0 @@ -5069,85 +4912,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.005161286, y: 0.0018310574, z: 0.005163432} m_Center: {x: 0.0000019071158, y: 0.0009155273, z: -0.00000011955854} ---- !u!1 &283338224 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 283338225} - - component: {fileID: 283338227} - - component: {fileID: 283338226} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &283338225 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 283338224} - 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: 1179230186} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -8} - m_SizeDelta: {x: 72, y: 27} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &283338226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 283338224} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: f776afd81ae06854f9b7bd7d555cd9bd, type: 3} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6536\u56DE\u5DE5\u5177" ---- !u!222 &283338227 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 283338224} - m_CullTransparentMesh: 1 --- !u!1 &286447742 GameObject: m_ObjectHideFlags: 0 @@ -11547,113 +11311,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.005962372, y: 0.0021362305, z: 0.0059626102} m_Center: {x: 0.0000019073486, y: 0.0010681152, z: -0.00000011920929} ---- !u!1001 &676339781 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6121626523118833240} - m_Modifications: - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalPosition.x - value: 0.261 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalPosition.y - value: -0.389 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalPosition.z - value: 0.611 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalRotation.w - value: 0.5000232 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalRotation.x - value: -0.5000232 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalRotation.y - value: 0.4999768 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalRotation.z - value: 0.49997693 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4420855389286102340, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_Name - value: "\u76D2\u88C5\u5C01\u5370" - objectReference: {fileID: 0} - - target: {fileID: 4420855389286102340, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5637517320073565024, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8779673032827270957, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - insertIndex: -1 - addedObject: {fileID: 255406706} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4420855389286102340, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - insertIndex: -1 - addedObject: {fileID: 676339784} - m_SourcePrefab: {fileID: 100100000, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} ---- !u!4 &676339782 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3896132790297866238, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - m_PrefabInstance: {fileID: 676339781} - m_PrefabAsset: {fileID: 0} ---- !u!1 &676339783 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4420855389286102340, guid: d17f7c3ac1579d647ae8f5045448af3f, type: 3} - m_PrefabInstance: {fileID: 676339781} - m_PrefabAsset: {fileID: 0} ---- !u!114 &676339784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 676339783} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 855955b40a9d31c418c103db0016d6a3, type: 3} - m_Name: - m_EditorClassIdentifier: - SealObj: {fileID: 0} - Sealcol: - - {fileID: 691769116} - - {fileID: 691769115} - sealbcl: - - {fileID: 1601934745} - - {fileID: 682339698} - EndOfProcessImage: {fileID: 1393670469} - SparentoverCol: {fileID: 799716872} - CabinetDoorLatch: {fileID: 601364442} --- !u!1 &676673092 GameObject: m_ObjectHideFlags: 0 @@ -13564,123 +13221,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768781507} m_CullTransparentMesh: 1 ---- !u!1001 &779982552 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1485260144} - m_Modifications: - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7059219998895239338, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8460126229225677331, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Name - value: Canvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} ---- !u!224 &779982553 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 779982552} - m_PrefabAsset: {fileID: 0} ---- !u!114 &779982554 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6493708998332797694, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 779982552} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &795925215 GameObject: m_ObjectHideFlags: 0 @@ -14409,7 +13949,6 @@ RectTransform: - {fileID: 884140860} - {fileID: 1393670471} - {fileID: 1458369420} - - {fileID: 1179230186} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -19160,119 +18699,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1126864704} m_CullTransparentMesh: 1 ---- !u!1001 &1129396989 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 588400110} - m_Modifications: - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8460126229225677331, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Name - value: Canvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} ---- !u!224 &1129396990 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 1129396989} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1129396991 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6493708998332797694, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 1129396989} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!65 &1130307471 stripped BoxCollider: m_CorrespondingSourceObject: {fileID: 5944189480022684345, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} @@ -19760,127 +19186,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1175830567} m_CullTransparentMesh: 1 ---- !u!1 &1179230185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1179230186} - - component: {fileID: 1179230189} - - component: {fileID: 1179230188} - - component: {fileID: 1179230187} - m_Layer: 5 - m_Name: "\u6536\u56DE\u5DE5\u5177Btn" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1179230186 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179230185} - 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: 283338225} - m_Father: {fileID: 826737787} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 60} - m_SizeDelta: {x: 72, y: 72} - m_Pivot: {x: 1, y: 0} ---- !u!114 &1179230187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179230185} - 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: 1179230188} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1179230188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179230185} - 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: 1} - 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: 21300000, guid: 04b39ad12990ffa4d84537b19ed62db4, type: 3} - m_Type: 0 - 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!222 &1179230189 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179230185} - m_CullTransparentMesh: 1 --- !u!1 &1194940543 GameObject: m_ObjectHideFlags: 0 @@ -25599,11 +24904,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} propertyPath: m_LocalPosition.x -<<<<<<< HEAD value: 0.352 -======= - value: 0.252 ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa objectReference: {fileID: 0} - target: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} propertyPath: m_LocalPosition.y @@ -25611,11 +24912,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} propertyPath: m_LocalPosition.z -<<<<<<< HEAD value: 0.611 -======= - value: 0.487 ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa objectReference: {fileID: 0} - target: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} propertyPath: m_LocalRotation.w @@ -25673,11 +24970,7 @@ PrefabInstance: addedObject: {fileID: 1405778779} - targetCorrespondingSourceObject: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} insertIndex: -1 -<<<<<<< HEAD addedObject: {fileID: 1228119979} -======= - addedObject: {fileID: 779982553} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa - targetCorrespondingSourceObject: {fileID: 3365665717505135107, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} insertIndex: 18 addedObject: {fileID: 1601934743} @@ -26591,7 +25884,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1505150131} - - component: {fileID: 1505150133} - component: {fileID: 1505150132} - component: {fileID: 1505150133} m_Layer: 0 @@ -26623,7 +25915,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1505150129} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e33923dee0d2a0f4f81ca859f6fc70d5, type: 3} m_Name: @@ -26636,20 +25928,10 @@ MonoBehaviour: - {fileID: 1112936940} - {fileID: 588400109} - {fileID: 1485260145} - - {fileID: 676339783} + - {fileID: 2018635915} ui: {fileID: 1393670468} processBt: {fileID: 1290596210} PutBack: {fileID: 506401300} -<<<<<<< HEAD -======= - RetractToolBtn: - - {fileID: 4441233656616589335} - - {fileID: 1778492072} - - {fileID: 1754372867} - - {fileID: 1129396991} - - {fileID: 779982554} - - {fileID: 255406707} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa --- !u!114 &1505150133 MonoBehaviour: m_ObjectHideFlags: 0 @@ -26659,16 +25941,11 @@ MonoBehaviour: m_GameObject: {fileID: 1505150129} m_Enabled: 1 m_EditorHideFlags: 0 -<<<<<<< HEAD m_Script: {fileID: 11500000, guid: 2eed0f648ec3b074fa4410e5560187d3, type: 3} -======= - m_Script: {fileID: 11500000, guid: 91bb429240832294496ccae011ddc438, type: 3} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa m_Name: m_EditorClassIdentifier: tools: - toolObject: {fileID: 1624776703} -<<<<<<< HEAD returnButton: {fileID: 5021212190867540431} originalPosition: {x: 0, y: 0, z: 0} originalRotation: {x: 0, y: 0, z: 0, w: 0} @@ -26697,31 +25974,6 @@ MonoBehaviour: originalPosition: {x: 0, y: 0, z: 0} originalRotation: {x: 0, y: 0, z: 0, w: 0} PlayercameraTrans: {fileID: 6121626523118833240} -======= - returnButton: {fileID: 4441233656616589335} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 926201691} - returnButton: {fileID: 1778492072} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 1112936940} - returnButton: {fileID: 1754372867} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 1485260145} - returnButton: {fileID: 779982554} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 588400109} - returnButton: {fileID: 1129396991} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} - - toolObject: {fileID: 676339783} - returnButton: {fileID: 255406707} - originalPosition: {x: 0, y: 0, z: 0} - originalRotation: {x: 0, y: 0, z: 0, w: 0} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa --- !u!1 &1511629609 GameObject: m_ObjectHideFlags: 0 @@ -26911,7 +26163,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 51f73ee94f284a86b677a6bc74544094, type: 3} m_Name: m_EditorClassIdentifier: - _toolsPackScene: 1 --- !u!4 &1516723168 Transform: m_ObjectHideFlags: 0 @@ -29336,11 +28587,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7463771665152150607, guid: 58e406f71b32d884392695381bfd0ac5, type: 3} propertyPath: m_LocalPosition.z -<<<<<<< HEAD value: 0.611 -======= - value: 0.522 ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa objectReference: {fileID: 0} - target: {fileID: 7463771665152150607, guid: 58e406f71b32d884392695381bfd0ac5, type: 3} propertyPath: m_LocalRotation.w @@ -29387,11 +28634,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7463771665152150607, guid: 58e406f71b32d884392695381bfd0ac5, type: 3} insertIndex: -1 -<<<<<<< HEAD addedObject: {fileID: 427595200} -======= - addedObject: {fileID: 1754372866} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7845117050773395189, guid: 58e406f71b32d884392695381bfd0ac5, type: 3} insertIndex: -1 @@ -31366,119 +30609,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1746751618} m_CullTransparentMesh: 1 ---- !u!1001 &1754372865 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1112936941} - m_Modifications: - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8460126229225677331, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Name - value: Canvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} ---- !u!224 &1754372866 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 1754372865} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1754372867 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6493708998332797694, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 1754372865} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1755457971 stripped GameObject: m_CorrespondingSourceObject: {fileID: 965816488757340388, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3} @@ -32110,7 +31240,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1778492073} m_SourcePrefab: {fileID: 100100000, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3} -<<<<<<< HEAD --- !u!1 &1778492072 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7661601162608444638, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3} @@ -32166,19 +31295,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} -======= ---- !u!114 &1778492072 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8386376338622241410, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3} - m_PrefabInstance: {fileID: 1778492071} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa --- !u!1 &1781163734 GameObject: m_ObjectHideFlags: 0 @@ -32569,7 +31685,6 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} propertyPath: m_LocalPosition.x -<<<<<<< HEAD value: 0.35 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} @@ -32579,17 +31694,6 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} propertyPath: m_LocalPosition.z value: 0.615 -======= - value: 0.321 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} - propertyPath: m_LocalPosition.y - value: -0.187 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} - propertyPath: m_LocalPosition.z - value: 0.611 ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} propertyPath: m_LocalRotation.w @@ -32597,7 +31701,6 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} propertyPath: m_LocalRotation.x -<<<<<<< HEAD value: 0.000000058143144 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} @@ -32607,17 +31710,6 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} propertyPath: m_LocalRotation.z value: 0.00000006102591 -======= - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 3aaf9bbbf390baa4186f7750f7506ae5, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -33016,7 +32108,6 @@ MonoBehaviour: - {fileID: 1112936940} - {fileID: 588400109} - {fileID: 1485260145} -<<<<<<< HEAD - {fileID: 2018635915} RetractBtn: - {fileID: 5021212190867540431} @@ -33025,9 +32116,6 @@ MonoBehaviour: - {fileID: 1699029881} - {fileID: 1228119980} - {fileID: 1271177856} -======= - - {fileID: 0} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa --- !u!114 &1810323354 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33060,8 +32148,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 0.9999897, z: 0.95179063} - m_Center: {x: 0, y: 0, z: -0.1657471} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1810323356 MeshRenderer: m_ObjectHideFlags: 0 @@ -35239,8 +34327,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 35.935974, y: 78.421936, z: 1.0064006} - m_Center: {x: 32.903282, y: -1.7947019, z: -19.97139} + m_Size: {x: 36.589027, y: 82.01166, z: 1.0063992} + m_Center: {x: 33.392933, y: 0.0000923872, z: -19.971397} --- !u!1 &1974144506 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5397049522284226170, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} @@ -35867,7 +34955,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2015178292} m_CullTransparentMesh: 1 -<<<<<<< HEAD --- !u!1001 &2018635913 PrefabInstance: m_ObjectHideFlags: 0 @@ -36006,8 +35093,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8a2ec57d86080374dbadae4c9f35d207, type: 3} m_Name: m_EditorClassIdentifier: -======= ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa --- !u!1 &2024319182 GameObject: m_ObjectHideFlags: 0 @@ -229329,17 +228414,6 @@ PrefabInstance: addedObject: {fileID: 5021212190867540430} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3} ---- !u!114 &4441233656616589335 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3822578206396558787, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3} - m_PrefabInstance: {fileID: 4441233656616589334} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!64 &4459080182946570877 MeshCollider: m_ObjectHideFlags: 0 @@ -229449,7 +228523,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4935687417024074564, guid: 8b993b62b75a2c8438fceaa4a463c01a, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5038197461594410743, guid: 8b993b62b75a2c8438fceaa4a463c01a, type: 3} propertyPath: m_AnchoredPosition.x @@ -229760,20 +228834,13 @@ Transform: - {fileID: 2121596293} - {fileID: 1146142254} - {fileID: 1469111733} - - {fileID: 1112936941} - {fileID: 1624776712} - {fileID: 926201697} - {fileID: 895989075} -<<<<<<< HEAD - {fileID: 1112936941} - {fileID: 588400110} - {fileID: 1485260144} - {fileID: 2018635914} -======= - - {fileID: 588400110} - - {fileID: 1485260144} - - {fileID: 676339782} ->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa m_Father: {fileID: 6121626523198945501} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6121626523118833245 diff --git a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln index 1b37a01c..8618ec7c 100644 --- a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln +++ b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln @@ -1,63 +1,90 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{b366c870-8269-aeae-4186-8220020279aa}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{70C866B3-6982-AEAE-4186-8220020279AA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{e8ea8a32-db36-1909-a8a7-26f06060f4d3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{328AEAE8-36DB-0919-A8A7-26F06060F4D3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{a90e88d8-badb-4199-850a-29eeee6b3832}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{D8880EA9-DBBA-9941-850A-29EEEE6B3832}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{2fd61c43-4224-9fcb-8a4a-9397608e2318}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{431CD62F-2442-CB9F-8A4A-9397608E2318}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{edefe799-dc28-4dd2-3165-1acb9e1a5d82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{775d4e80-7b8a-c113-e64a-f0327b5a51d2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{7c2f9189-479d-675c-b95e-c95f88c2a560}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{89912F7C-9D47-5C67-B95E-C95F88C2A560}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{27e42685-adfb-0aa0-06e3-f5025d183005}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{8526E427-FBAD-A00A-06E3-F5025D183005}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{4d0abe3e-2eff-5141-cb61-b756eb38b78b}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{bae393ca-b3f2-035c-979c-ff7e0d806194}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{76df232d-8837-10f6-4eb2-65d4b80d2c66}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{2D23DF76-3788-F610-4EB2-65D4B80D2C66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{c5ee6955-1356-fe62-795c-07a46b224741}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{5569EEC5-5613-62FE-795C-07A46B224741}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{db9a3453-d36d-6192-985b-3e8cc856b5bd}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{53349ADB-6DD3-9261-985B-3E8CC856B5BD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.Build.0 = Debug|Any CPU - {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.Build.0 = Debug|Any CPU - {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.Build.0 = Debug|Any CPU - {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.Build.0 = Release|Any CPU + {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.Build.0 = Release|Any CPU + {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.Build.0 = Release|Any CPU + {431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.Build.0 = Debug|Any CPU + {431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.ActiveCfg = Release|Any CPU + {431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.Build.0 = Release|Any CPU + {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.Build.0 = Release|Any CPU + {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.Build.0 = Release|Any CPU + {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.Build.0 = Release|Any CPU + {8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.Build.0 = Release|Any CPU + {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.Build.0 = Release|Any CPU + {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.Build.0 = Release|Any CPU + {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.Build.0 = Release|Any CPU + {5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.Build.0 = Release|Any CPU + {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE