Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition

SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity

@@ -8691,42 +8691,18 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 8810976127009250453, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 601364445}
   m_SourcePrefab: {fileID: 100100000, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
 --- !u!4 &601364441 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8322912254063910965, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
   m_PrefabInstance: {fileID: 601364440}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &601364444 stripped
+--- !u!137 &601364448 stripped
-GameObject:
+SkinnedMeshRenderer:
-  m_CorrespondingSourceObject: {fileID: 8810976127009250453, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
+  m_CorrespondingSourceObject: {fileID: 5725098936793829084, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
   m_PrefabInstance: {fileID: 601364440}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &601364445
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 601364444}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.012151217, y: 0.0088528525, z: 0.027755149}
-  m_Center: {x: 0.0000001341104, y: 0.0000026882633, z: 0.00000017881396}
 --- !u!1 &603379991
 GameObject:
   m_ObjectHideFlags: 0
@@ -10234,6 +10210,11 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 718627080}
   m_CullTransparentMesh: 1
+--- !u!4 &722991826 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
+  m_PrefabInstance: {fileID: 601364440}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &732272182
 GameObject:
   m_ObjectHideFlags: 0
@@ -13247,6 +13228,11 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_IsOn: 0
+--- !u!4 &915989698 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7727877916779522580, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
+  m_PrefabInstance: {fileID: 601364440}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &921963136
 GameObject:
   m_ObjectHideFlags: 0
@@ -22918,6 +22904,33 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1620106692}
   m_CullTransparentMesh: 1
+--- !u!1 &1624776703 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5376740296190089428, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+  m_PrefabInstance: {fileID: 4441233656616589334}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1624776704
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1624776703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b47ec41343fb25f4e81cbeceb223bc5a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PliersObj: {fileID: 1624776703}
+  PliersSki: {fileID: 1624776708}
+  SkinnedMeshRenderer: {fileID: 601364448}
+  Doorlock: {fileID: 915989698}
+  DoorOfCabinet: {fileID: 722991826}
+--- !u!137 &1624776708 stripped
+SkinnedMeshRenderer:
+  m_CorrespondingSourceObject: {fileID: 887944540873686423, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+  m_PrefabInstance: {fileID: 4441233656616589334}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1625037053
 GameObject:
   m_ObjectHideFlags: 0
@@ -221807,17 +221820,29 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 887944540873686423, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      propertyPath: m_Quality
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 887944540873686423, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      propertyPath: m_UpdateWhenOffscreen
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 887944540873686423, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[0]
+      value: 100
+      objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -1.4711838
+      value: 303.05
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.07306337
+      value: 2.386
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.13374138
+      value: 163.028
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalRotation.w
@@ -221825,15 +221850,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
-      propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -221841,7 +221866,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
@@ -221851,10 +221876,17 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5265\u7EBF\u94B3"
       objectReference: {fileID: 0}
+    - target: {fileID: 5376740296190089428, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5376740296190089428, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1624776704}
   m_SourcePrefab: {fileID: 100100000, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
 --- !u!64 &4459080182946570877
 MeshCollider:

SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs

@@ -16,7 +16,7 @@ public class Pliers : MonoBehaviour
     /// <summary>
     /// 钳线动画
     /// </summary>
-    public Animation PliersAni;
+    public SkinnedMeshRenderer PliersSki;
 
     /// <summary>
     /// 封印动画
@@ -62,22 +62,28 @@ public class Pliers : MonoBehaviour
                 }
             }
         }
-        if (Input.GetKeyDown(KeyCode.E))
+        //if (Input.GetKeyDown(KeyCode.E))
-        {
+        //{
-            PliersAni.Play("ǯÏß");
+        //    PliersAni.Play("ǯÏß");
-        }
+        //}
     }
-
+    float weight;
     /// <summary>
     /// 剥线钳动画
     /// </summary>
     /// <returns></returns>
     IEnumerator PliersIE()
     {
-        PliersObj.gameObject.transform.DOLocalMove(new Vector3(303.0849f, 2.7143f, 163.5919f),1f);
+        PliersObj.gameObject.transform.DOLocalMove(new Vector3(303.0849f, 2.696f, 163.5919f),1f);
+        yield return new WaitForSeconds(1.5f);
+        PliersObj.gameObject.transform.DOLocalRotate(new Vector3(-90,90,0),1.5f);
         yield return new WaitForSeconds(2f);
-        PliersAni.Play("ǯÏß");
+        for (int i = 100; i >= 0; i--)
-        yield return new WaitForSeconds(1);
+        {
+            yield return new WaitForSeconds(0.01f);
+            PliersSki.SetBlendShapeWeight(0, i);
+        }
+        yield return new WaitForSeconds(1f);
         StartCoroutine(OpenLock());
     }
 
@@ -105,9 +111,18 @@ public class Pliers : MonoBehaviour
     /// <returns></returns>
     IEnumerator OpenDoor()
     {
-        yield return new WaitForSeconds(1f);
+        yield return new WaitForSeconds(0.5f);
-        Doorlock.transform.DOLocalRotate(new Vector3(160, 0, 0), 2f);
+        Doorlock.transform.DOLocalRotate(new Vector3(160, 0, 0), 1f);
-        yield return new WaitForSeconds(3f);
+        yield return new WaitForSeconds(1.5f);
-        DoorOfCabinet.transform.DOLocalRotate(new Vector3(-90, 160, 0), 2f);
+        DoorOfCabinet.transform.DOLocalRotate(new Vector3(-90, 0, 160), 2f);
+        StartCoroutine(PliersBack());
+    }
+
+    IEnumerator PliersBack()
+    {
+        PliersObj.gameObject.transform.DOLocalMove(new Vector3(303.05f, 2.386f, 163.028f),1.5f);
+        PliersObj.gameObject.transform.DOLocalRotate(new Vector3(0,90,0),1.5f);
+        yield return new WaitForSeconds(2f);
+        PliersObj.gameObject.SetActive(false);
     }
 }