6.21九点提交

SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity

@@ -24662,6 +24662,25 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3}
   m_PrefabInstance: {fileID: 1805985062}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1438674222
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438674219}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e2c0d91c16aadf42adb4c9c3a20c85c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textLabel: {fileID: 1029271563}
+  faceImage: {fileID: 286447744}
+  textFile: {fileID: 4900000, guid: 7f57b0dfa0d787746b548541011b11be, type: 3}
+  index: 0
+  ExclamationPointBtn: {fileID: 1323160595}
+  NextsentenceBtn: {fileID: 318329857}
+  ExitBtn: {fileID: 899733633}
 --- !u!1 &1441443211
 GameObject:
   m_ObjectHideFlags: 0
@@ -27018,6 +27037,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _toolsPackScene: 0
   _processMode: 0
+  messageGame: {fileID: 0}
 --- !u!4 &1516723168
 Transform:
   m_ObjectHideFlags: 0
@@ -33140,6 +33160,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: fe4c1814d44af964c94c33808b704426, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1438674220}
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: fe4c1814d44af964c94c33808b704426, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1438674222}
   m_SourcePrefab: {fileID: 100100000, guid: fe4c1814d44af964c94c33808b704426, type: 3}
 --- !u!1 &1807823109
 GameObject:
@@ -33880,11 +33903,11 @@ Transform:
   - {fileID: 1176023171}
   - {fileID: 1285315233}
   - {fileID: 234854336}
-  - {fileID: 1150006206}
   - {fileID: 1230813319}
-  - {fileID: 1733212812}
   - {fileID: 308397488}
   - {fileID: 1060361990}
+  - {fileID: 1150006206}
+  - {fileID: 1733212812}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &1865558430 stripped
@@ -230255,7 +230278,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6121626523118833245}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3ac993d98ca1c3d47b28cf2a9d81d94f, type: 3}
   m_Name: 
@@ -230543,7 +230566,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6121626523908351179}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5e2c0d91c16aadf42adb4c9c3a20c85c, type: 3}
   m_Name: 

SXElectricityInformationAcquisition/Assets/Screwdriver.cs

@@ -126,6 +126,8 @@ public class Screwdriver : MonoBehaviour
         TapeMar.SetFloat("_step_p5", 0);
         TapeMar.SetFloat("_step_p6", 0);
         //TapeMar.SetFloat("_step_p1", 1);
+        originalPosition = ScrewdriverTrans.transform.localPosition;
+        originalRotation = ScrewdriverTrans.transform.localRotation;
     }
 
     // Update is called once per frame

SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs

@@ -235,7 +235,7 @@ public class Pliers : MonoBehaviour
             yield return new WaitForSeconds(0.001f);
             PliersSki.SetBlendShapeWeight(0, i);
         }
-        yield return new WaitForSeconds(0.5f);
+        yield return new WaitForSeconds(0.1f);
         for (int i = 0; i < 100; i++)
         {
             yield return new WaitForSeconds(0.001f);
@@ -264,7 +264,7 @@ public class Pliers : MonoBehaviour
             yield return new WaitForSeconds(0.001f);
             PliersSki.SetBlendShapeWeight(0, i);
         }
-        yield return new WaitForSeconds(0.5f);
+        yield return new WaitForSeconds(0.1f);
         for (int i = 0; i < 100; i++)
         {
             yield return new WaitForSeconds(0.001f);
@@ -293,7 +293,7 @@ public class Pliers : MonoBehaviour
             yield return new WaitForSeconds(0.001f);
             PliersSki.SetBlendShapeWeight(0, i);
         }
-        yield return new WaitForSeconds(1f);
+        yield return new WaitForSeconds(0.1f);
         for (int i = 0; i < 100; i++)
         {
             yield return new WaitForSeconds(0.001f);
@@ -321,7 +321,7 @@ public class Pliers : MonoBehaviour
             yield return new WaitForSeconds(0.001f);
             PliersSki.SetBlendShapeWeight(0, i);
         }
-        yield return new WaitForSeconds(1f);
+        yield return new WaitForSeconds(0.1f);
         for (int i = 0; i < 100; i++)
         {
             yield return new WaitForSeconds(0.001f);

SXElectricityInformationAcquisition/Assets/taoruiqi/Script/NPC Dialogue.cs

@@ -82,7 +82,7 @@ public class NPCDialogue : MonoBehaviour
     /// <param name="other"></param>
     private void OnTriggerEnter(Collider other)
     {
-        if (other.name == "Man_stand")
+        if (other.tag == "Player")
         {
             ExclamationPointBtn.gameObject.SetActive(true);
             index = 0;