1

6.20上午提交tsq
2024-06-20 09:29:32 +08:00 · 2024-06-20 09:13:38 +08:00
9 changed files with 1539 additions and 50 deletions
--- a/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/验电笔光.mat
+++ b/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/验电笔光.mat
@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u9A8C\u7535\u7B14\u5149"
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 0.00949898, b: 0, a: 1}
+    - _EmissionColor: {r: 16.000004, g: 0, b: 0.16880803, a: 1}
+  m_BuildTextureStacks: []
--- a/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/验电笔光.mat.meta
+++ b/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/验电笔光.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4bb71a41e0a8de94183ac98446acfcf7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab
+++ b/SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab
@ -9,7 +9,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2038441939940343167}
-  - component: {fileID: 7670339232524541965}
+  - component: {fileID: 4082963790152404584}
+  - component: {fileID: 3232903256917466313}
  m_Layer: 0
  m_Name: surface
  m_TagString: Untagged
@ -27,32 +28,40 @@ Transform:
  serializedVersion: 2
  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
  m_LocalPosition: {x: 0.00042, y: -0.00774, z: -0.0164}
-  m_LocalScale: {x: 0.0026850183, y: 0.013216278, z: 1}
+  m_LocalScale: {x: 0.013, y: 0.033, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1245463814537934017}
  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!212 &7670339232524541965
-SpriteRenderer:
+--- !u!33 &4082963790152404584
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7661601162608444638}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3232903256917466313
+MeshRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7661601162608444638}
  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
+  m_RayTracingMode: 2
  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 4bb71a41e0a8de94183ac98446acfcf7, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -65,7 +74,7 @@ SpriteRenderer:
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
+  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
@ -73,17 +82,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 3b2879f3467a51d419f3e182772e9b36, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 5.12, y: 2.56}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1001 &1640013680829502250
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -382,6 +381,8 @@ MonoBehaviour:
  _modelTypeEnum: 0
  _toolsPackScene: 0
  IsClick: 1
+<<<<<<< HEAD
+=======
 --- !u!1001 &3349601928785135740
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -492,3 +493,4 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3}
  m_PrefabInstance: {fileID: 3349601928785135740}
  m_PrefabAsset: {fileID: 0}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
--- a/SXElectricityInformationAcquisition/Assets/Scenes/现场
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场
--- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs
@ -20,6 +20,11 @@ public class ToolManager : MonoBehaviour
    public Button PutBack;
    public GameObject[] Tool;

+    /// <summary>
+    /// 澗쀼묏야객큐
+    /// </summary>
+    public Button[] RetractBtn;
+
    bool inthis;

    void Start()
@ -93,28 +98,34 @@ public class ToolManager : MonoBehaviour
        if (message == "괆窟풂")
        {
            Tool[2].gameObject.SetActive(true);
+                RetractBtn[0].gameObject.SetActive(true);
        }
        if (message == "駱든궝")
        {
            Tool[3].gameObject.SetActive(true);
-        }
+                RetractBtn[1].gameObject.SetActive(true);
+            }
        if (message == "쭁介독")
        {
            Tool[4].gameObject.SetActive(true);
-        }
+                RetractBtn[2].gameObject.SetActive(true);
+            }
        if (message == "없鍍스던")
        {
            Tool[5].gameObject.SetActive(true);
-        }
+                RetractBtn[3].gameObject.SetActive(true);
+            }

        if (message == "l謹섞櫓포")
        {
            Tool[6].gameObject.SetActive(true);
-        }
+                RetractBtn[4].gameObject.SetActive(true);
+            }
        if (message == "분陋룐丹")
        {
            Tool[7].gameObject.SetActive(true);
-        }
+                RetractBtn[5].gameObject.SetActive(true);
+            }

        Debug.Log("Received message: " + message);
    }
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Prefab.meta
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Prefab.meta
@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: e65fd8402f9c71943ad467688c3cfd1c
+=======
 guid: 221ef3fe23931334a96a50f20300b0d0
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Prefab/Canvas.prefab
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Prefab/Canvas.prefab
@ -1,6 +1,10 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+<<<<<<< HEAD
+--- !u!1 &2436855887356756049
+=======
 --- !u!1 &7059219998895239338
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -8,23 +12,51 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+<<<<<<< HEAD
+  - component: {fileID: 4904921657498032292}
+  - component: {fileID: 4372243972201472502}
+  - component: {fileID: 644263379363103971}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+=======
  - component: {fileID: 6639085749057391050}
  - component: {fileID: 852134155736704951}
  - component: {fileID: 6296124967189605899}
  - component: {fileID: 6493708998332797694}
  m_Layer: 5
  m_Name: "\u6536\u56DE\u5DE5\u5177\u6309\u94AE"
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+<<<<<<< HEAD
+--- !u!224 &4904921657498032292
+=======
 --- !u!224 &6639085749057391050
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 2436855887356756049}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000062500025}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7081356935504397210}
+  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!222 &4372243972201472502
+=======
  m_GameObject: {fileID: 7059219998895239338}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.0000000638962}
@ -40,23 +72,37 @@ RectTransform:
  m_SizeDelta: {x: 72, y: 72}
  m_Pivot: {x: 1, y: 0}
 --- !u!222 &852134155736704951
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 2436855887356756049}
+  m_CullTransparentMesh: 1
+--- !u!114 &644263379363103971
+=======
  m_GameObject: {fileID: 7059219998895239338}
  m_CullTransparentMesh: 1
 --- !u!114 &6296124967189605899
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 2436855887356756049}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+=======
  m_GameObject: {fileID: 7059219998895239338}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@ -67,6 +113,23 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
+<<<<<<< HEAD
+  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!1 &7086742680094360731
+=======
  m_Sprite: {fileID: 21300000, guid: 04b39ad12990ffa4d84537b19ed62db4, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
@ -122,6 +185,7 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
 --- !u!1 &8460126229225677331
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -129,10 +193,17 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+<<<<<<< HEAD
+  - component: {fileID: 3417364842344813622}
+  - component: {fileID: 8969607313495349852}
+  - component: {fileID: 6295961691143176117}
+  - component: {fileID: 6289657526974683837}
+=======
  - component: {fileID: 3397580018280148513}
  - component: {fileID: 6622462504879864546}
  - component: {fileID: 7460907230226610774}
  - component: {fileID: 2986611911677580779}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Layer: 5
  m_Name: Canvas
  m_TagString: Untagged
@ -140,19 +211,31 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+<<<<<<< HEAD
+--- !u!224 &3417364842344813622
+=======
 --- !u!224 &3397580018280148513
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 7086742680094360731}
+=======
  m_GameObject: {fileID: 8460126229225677331}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  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:
+<<<<<<< HEAD
+  - {fileID: 7081356935504397210}
+=======
  - {fileID: 6639085749057391050}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
@ -160,13 +243,21 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
+<<<<<<< HEAD
+--- !u!223 &8969607313495349852
+=======
 --- !u!223 &6622462504879864546
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 Canvas:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 7086742680094360731}
+=======
  m_GameObject: {fileID: 8460126229225677331}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Enabled: 1
  serializedVersion: 3
  m_RenderMode: 0
@ -183,13 +274,21 @@ Canvas:
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
+<<<<<<< HEAD
+--- !u!114 &6295961691143176117
+=======
 --- !u!114 &7460907230226610774
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 7086742680094360731}
+=======
  m_GameObject: {fileID: 8460126229225677331}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@ -206,13 +305,21 @@ MonoBehaviour:
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
  m_PresetInfoIsWorld: 0
+<<<<<<< HEAD
+--- !u!114 &6289657526974683837
+=======
 --- !u!114 &2986611911677580779
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 7086742680094360731}
+=======
  m_GameObject: {fileID: 8460126229225677331}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@ -223,7 +330,11 @@ MonoBehaviour:
  m_BlockingMask:
    serializedVersion: 2
    m_Bits: 4294967295
+<<<<<<< HEAD
+--- !u!1 &8411439225802802589
+=======
 --- !u!1 &8502336301181993835
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -231,22 +342,52 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+<<<<<<< HEAD
+  - component: {fileID: 7081356935504397210}
+  - component: {fileID: 1374419575702600448}
+  - component: {fileID: 2650464856150241646}
+  - component: {fileID: 8372697795211213173}
+  m_Layer: 5
+  m_Name: "\u6536\u56DE\u6309\u94AE"
+=======
  - component: {fileID: 5813586263362733846}
  - component: {fileID: 5606900254108448930}
  - component: {fileID: 6423261177486446271}
  m_Layer: 5
  m_Name: "\u6536\u56DE\u5DE5\u5177Text "
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+<<<<<<< HEAD
+--- !u!224 &7081356935504397210
+=======
 --- !u!224 &5813586263362733846
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 8411439225802802589}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000062500025}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4904921657498032292}
+  m_Father: {fileID: 3417364842344813622}
+  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: 65}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1374419575702600448
+=======
  m_GameObject: {fileID: 8502336301181993835}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.000000027656569}
@ -261,23 +402,37 @@ RectTransform:
  m_SizeDelta: {x: 72, y: 27}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5606900254108448930
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 CanvasRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 8411439225802802589}
+  m_CullTransparentMesh: 1
+--- !u!114 &2650464856150241646
+=======
  m_GameObject: {fileID: 8502336301181993835}
  m_CullTransparentMesh: 1
 --- !u!114 &6423261177486446271
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 8411439225802802589}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+=======
  m_GameObject: {fileID: 8502336301181993835}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@ -288,6 +443,62 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
+<<<<<<< HEAD
+  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!114 &8372697795211213173
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8411439225802802589}
+  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: 2650464856150241646}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+=======
  m_FontData:
    m_Font: {fileID: 12800000, guid: f776afd81ae06854f9b7bd7d555cd9bd, type: 3}
    m_FontSize: 18
@ -302,3 +513,4 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: "\u6536\u56DE\u5DE5\u5177"
+>>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
@ -0,0 +1,47 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+
+public class TooslManager : MonoBehaviour
+{
+    [System.Serializable]
+    public class Tool
+    {
+        public GameObject toolObject;
+        public Button returnButton;
+        [HideInInspector]
+        public Vector3 originalPosition;
+        [HideInInspector]
+        public Quaternion originalRotation;
+    }
+
+    public List<Tool> tools;
+
+    public Transform PlayercameraTrans;
+
+    void Start()
+    {
+        foreach (var tool in tools)
+        {
+            // 保存每个工具的原始位置和旋转
+            tool.originalPosition = tool.toolObject.transform.localPosition;
+            tool.originalRotation = tool.toolObject.transform.localRotation;
+
+            // 为每个按钮添加点击事件
+            tool.returnButton.onClick.AddListener(ResetAllTools);
+        }
+    }
+
+    // 返回所有工具到原始位置并隐藏
+    public void ResetAllTools()
+    {
+        foreach (var tool in tools)
+        {
+            tool.toolObject.transform.localPosition = tool.originalPosition;
+            tool.toolObject.transform.localRotation = tool.originalRotation;
+            tool.toolObject.SetActive(false);
+            tool.toolObject.transform.SetParent(PlayercameraTrans.transform);
+        }
+    }
+}
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs.meta
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2eed0f648ec3b074fa4410e5560187d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant:
Author	SHA1	Message	Date
taosuqi	44841a876e	1	2024-06-20 09:29:32 +08:00
taosuqi	3d8a8346c5	6.20上午提交tsq	2024-06-20 09:13:38 +08:00