0914AM

SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/绝缘胶带绑线p1.mat

@@ -114,12 +114,12 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     - __dirty: 0
-    - _step_p1: 0
+    - _step_p1: 1
-    - _step_p2: 0
+    - _step_p2: 1
-    - _step_p3: 0
+    - _step_p3: 1
-    - _step_p4: 0
+    - _step_p4: 1
-    - _step_p5: 0
+    - _step_p5: 1
-    - _step_p6: 0
+    - _step_p6: 1
     m_Colors:
     - _BaseCol: {r: 0.23429155, g: 0.28497556, b: 0.3679245, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}

SXElectricityInformationAcquisition/Assets/Scenes/Start.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

SXElectricityInformationAcquisition/Assets/Scripts/HQB/SubmitBtn.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SubmitBtn : MonoBehaviour
+{
+    public CompleteOverComponent CompleteOverComponent;
+    public GameObject SubmitPlane;
+
+    public void PressSubmitBtn()
+    { 
+    
+    }
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

SXElectricityInformationAcquisition/Assets/Scripts/HQB/SubmitBtn.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 29a20ca670e09c849b79bec899abeb97
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs

@@ -238,7 +238,7 @@ namespace DefaultNamespace.ProcessMode
                 }
             }
 
-            //if (IsInPracticeOrAssessment()) return true;//0911HQB
+            if (IsInPracticeOrAssessment()) return true;//0911HQB
             return false;
         }
 
@@ -572,7 +572,8 @@ namespace DefaultNamespace.ProcessMode
                     sub.setScore = step.Score;
                 }
 
-                _submitScoreSteps.Add(sub);
+                if (MotionEngine.GetModule<DataConfigManager>().GetProcessMode() == ProcessMode.Assessment)//HQB 考试才记录用户记录
+                    _submitScoreSteps.Add(sub);
             }
 
             Debug.Log($"总分: {totalScore}");
@@ -724,7 +725,8 @@ namespace DefaultNamespace.ProcessMode
         /// </summary>
         public int AdjustedTotalScore()
         { 
-        
+            int totalScore = 0;
+            return totalScore;
         }
 
         //public void AdjustScoreInPractice(CheckPoint checkPoint)

SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs

@@ -11,6 +11,7 @@ namespace ToolsPack
     public class ToolsPackSceneJump : MonoBehaviour
     {
         public string Scenename;
+        private string saveSN;//LY
         public void Start()
         {
             //学习模式下不能返回工具间
@@ -22,6 +23,11 @@ namespace ToolsPack
             {
                 this.GetComponent<Button>().onClick.AddListener(delegate
                 {
+                    if (saveSN == Scenename)//LY
+                    {
+                        return;
+                    }
+                    saveSN = Scenename;
                     // MotionEngine.GetModule<AnimationProcessManager>().HandleClick("前往现场");
                     SceneManager.LoadScene(Scenename);
                 });

SXElectricityInformationAcquisition/Assets/ToolManager.cs

@@ -41,11 +41,12 @@ public class ToolManager : MonoBehaviour
     private void Awake()
     {
         instans = this;
+        
     }
     void Start()
     {
-
+       
-        //inthis = true;
+            //inthis = true;
         generateAreaScript = generateArea.GetComponent<GenerateArea>();
         MotionEngine.GetModule<AnimationProcessManager>().OnUIEvent += UIEvent;
 
@@ -90,6 +91,12 @@ public class ToolManager : MonoBehaviour
         //MotionEngine.GetModule<ToolsPackManager>().OnStringEvent += HandleStringEvent;
 
     }
+
+    private void OnDestroy()
+    {
+        MotionEngine.GetModule<ToolsPackManager>().OnStringEvent -= HandleStringEvents;
+    }
+
     private void Update()
     {
         //if (RoleMove.instance.isup)

SXElectricityInformationAcquisition/Assets/taoruiqi/CompleteOverComponent.cs

@@ -21,6 +21,11 @@ public class CompleteOverComponent : MonoBehaviour
 
     }
 
+    private void OnDestroy()
+    {
+        MotionEngine.GetModule<AnimationProcessManager>().OnCompleteEvent -= CompleteEvent;
+    }
+
     private void CompleteEvent(int score)
     {
         overGame.SetActive(true);