(1)带着装备下梯子，背包无法打开（2）考试模式下可以自由行动（3）两个工具拿出时候会报错

SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs

@@ -22,10 +22,7 @@ public class GameLauncher : MonoBehaviour
     {
         // ³õʼ»¯¿ò¼Ü
         MotionEngine.Initialize(this, HandleMotionFrameworkLog);
-        
-        
         System.IO.File.WriteAllText(Application.streamingAssetsPath + "/start.ini", "1");
-        
     }
 
     void Start()

SXElectricityInformationAcquisition/Assets/Framework/Scripts/Runtime/Engine/Core/MotionEngine.cs

@@ -25,6 +25,15 @@ namespace MotionFramework
 		private static bool _isDirty = false;
 		private static long _frame = 0;
 
+		/// <summary>
+		/// HQB判断是否已经初始化过了
+		/// </summary>
+		/// <returns></returns>
+		public static bool IsInitialized()
+		{
+			return (_behaviour != null);
+		}
+
 		/// <summary>
 		/// 初始化框架
 		/// </summary>

SXElectricityInformationAcquisition/Assets/Scenes/Start.unity

@@ -2334,6 +2334,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: APP
       objectReference: {fileID: 0}
+    - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: m_TagString
+      value: Untagged
+      objectReference: {fileID: 0}
     - target: {fileID: 6053353591068959239, guid: fa12b84946083d14cb4447029910be28, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -2673,6 +2677,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1040707731}
+    - targetCorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1175298433}
     - targetCorrespondingSourceObject: {fileID: 7261749442720430534, guid: fa12b84946083d14cb4447029910be28, type: 3}
       insertIndex: -1
       addedObject: {fileID: 191666369}
@@ -12360,6 +12367,24 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1169519105}
   m_CullTransparentMesh: 1
+--- !u!1 &1175298427 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3}
+  m_PrefabInstance: {fileID: 191666367}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1175298433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1175298427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 950ed43ca18941be90c7e1a16b578539, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Scenename: "\u5DE5\u5177\u95F4"
 --- !u!1 &1176317608
 GameObject:
   m_ObjectHideFlags: 0

SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs

@@ -105,10 +105,14 @@ namespace DefaultNamespace.ProcessMode
             Debug.Log($"步骤 {stepIndex + 1} 错误点击的物体: {clickedObject}");
         }
 
-        public bool HandleClick(string clickedObject)
+        bool IsInPracticeOrAssessment()//0912 HQB判断当前是否为考试
         {
+            return (MotionEngine.GetModule<DataConfigManager>().GetProcessMode() == ProcessMode.Assessment ||
+                MotionEngine.GetModule<DataConfigManager>().GetProcessMode() == ProcessMode.Practice);
+        }
 
-
+        public bool HandleClick(string clickedObject)//0911HQB 练习和考试点击全部返回True,把出口都换成True
+        {
             System.Diagnostics.StackTrace ts = new System.Diagnostics.StackTrace();
             System.Diagnostics.StackFrame[] stac = ts.GetFrames();
 
@@ -131,7 +135,7 @@ namespace DefaultNamespace.ProcessMode
                 {
                     AnimationStep step = process.Steps[_currentStepIndex];
                     ActionWithDescription currentAction = step.Actions[_currentActionIndex];
-                    if (_currentMode == ProcessMode.Teaching)
+                    if (_currentMode == ProcessMode.Teaching)//HQB 教学模式，不用管
                     {
                         // 强制有序处理
                         if (currentAction.TargetObjects[currentAction.CurrentObjectIndex].Equals(clickedObject))
@@ -158,7 +162,6 @@ namespace DefaultNamespace.ProcessMode
                             {
                                 Debug.Log($"正确点击了：{clickedObject}");
 
-
                                 currentAction.CurrentObjectIndex++; // 正确点击，递增对象索引
                                 currentAction.ClickedObjects.Add(clickedObject); // 添加到已点击对象集合
                                 HandleModeFeedback(_currentMode, currentAction); // 处理模式特定的反馈
@@ -171,6 +174,8 @@ namespace DefaultNamespace.ProcessMode
                             }
                             else
                             {
+                                if (IsInPracticeOrAssessment()) return true;//0911HQB
+
                                 string correctObjectName = currentAction.TargetObjects[currentAction.CurrentObjectIndex];
                                 Debug.Log($"错误点击或顺序错误：{clickedObject}。正确的物体是：{correctObjectName}");
                                 OnStepProcessDescriptionMessage?.Invoke($"<color=red>错误点击</color>，正确：{correctObjectName}");
@@ -224,6 +229,7 @@ namespace DefaultNamespace.ProcessMode
 
                                 AddIncorrectClick(_currentStepIndex, clickedObject);
                                 
+                                if (IsInPracticeOrAssessment()) return true;//0911HQB 此处要保留错误，但是要能跳到下一步
 
                                 return false;
                             }
@@ -232,6 +238,7 @@ namespace DefaultNamespace.ProcessMode
                 }
             }
 
+            //if (IsInPracticeOrAssessment()) return true;//0911HQB
             return false;
         }
 

SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs

@@ -58,7 +58,9 @@ namespace ToolsPack
             {
                 MotionEngine.GetModule<ToolsPackManager>().OnTriggerStringEvent(clickName);
                 index = _toolsPackWindowItemBtModels.Count - 1;
-                btName = _toolsPackWindowItemBtModels[_toolsPackWindowItemBtModels.Count - 1];
+                int tPIBM_Index = _toolsPackWindowItemBtModels.Count - 1;
+                if (tPIBM_Index > 0) tPIBM_Index = 0;//HQB多次拿同一个工具会出现问题
+                btName = _toolsPackWindowItemBtModels[tPIBM_Index];//[_toolsPackWindowItemBtModels.Count - 1];
                 switch (_modelTypeEnum)
                 {
                     case ModelTypeEnum.工具:

SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini

@@ -1 +1 @@
-2024-07-19 16:52:07#'ydcj://;cb,2,47,userId,username,token,90,-1,-1,http://ef0ba11.r27.cpolar.top;'|
+2024-07-19 16:52:07#'ydcj://;cb,0,47,userId,username,token,90,-1,-1,http://ef0ba11.r27.cpolar.top;'|

SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs

@@ -23,10 +23,6 @@ public class TooslManager : MonoBehaviour
         public Quaternion originalRotation;
     }
 
-
-
-
-
     public List<Tool> tools;
 
     /// <summary>
@@ -79,6 +75,7 @@ public class TooslManager : MonoBehaviour
             tool.toolObject.SetActive(false);
             Debug.Log("第二个位置：" + tool.originalPosition);
         }
+        UIManager.instance.toolsPackMenuBtOnClick.selfBtn.interactable = true ;//HQB下了梯子之后工具包就打不开了
     }
 
     ///// <summary>

SXElectricityInformationAcquisition/Packages/packages-lock.json

@@ -11,21 +11,21 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.editorcoroutines": {
       "version": "1.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.feature.development": {
       "version": "1.0.1",
@@ -48,7 +48,7 @@
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ide.visualstudio": {
       "version": "2.0.22",
@@ -57,21 +57,21 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.performance.profile-analyzer": {
       "version": "1.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.postprocessing": {
       "version": "3.4.0",
@@ -80,14 +80,14 @@
       "dependencies": {
         "com.unity.modules.physics": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.settings-manager": {
       "version": "2.0.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.test-framework": {
       "version": "1.1.33",
@@ -98,7 +98,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.testtools.codecoverage": {
       "version": "1.2.5",
@@ -108,7 +108,7 @@
         "com.unity.test-framework": "1.0.16",
         "com.unity.settings-manager": "1.0.1"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.textmeshpro": {
       "version": "3.0.6",
@@ -117,7 +117,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.timeline": {
       "version": "1.7.6",
@@ -129,7 +129,7 @@
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ugui": {
       "version": "1.0.0",
@@ -148,7 +148,7 @@
         "com.unity.ugui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.com
+    m_Url: https://packages.unity.cn
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
@@ -31,6 +31,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -830
+    m_UserModificationsInstanceId: -850
-    m_OriginalInstanceId: -832
+    m_OriginalInstanceId: -852
   m_LoadAssets: 0

SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.22f1
+m_EditorVersion: 2022.3.22f1c1
-m_EditorVersionWithRevision: 2022.3.22f1 (887be4894c44)
+m_EditorVersionWithRevision: 2022.3.22f1c1 (c3cbd310e76e)

SXElectricityInformationAcquisition/ProjectSettings/TagManager.asset

@@ -7,6 +7,7 @@ TagManager:
   - Marcador
   - Blocks
   - Tools
+  - GameLauncher
   layers:
   - Default
   - TransparentFX