diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity index 6e0fcae3..dcf9776b 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity @@ -2696,6 +2696,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3} insertIndex: -1 addedObject: {fileID: 1040707731} + - targetCorrespondingSourceObject: {fileID: 2254929100106748975, guid: fa12b84946083d14cb4447029910be28, type: 3} + insertIndex: -1 + addedObject: {fileID: 1847624254} - targetCorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3} insertIndex: -1 addedObject: {fileID: 1175298433} @@ -2729,6 +2732,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf30122e3df4e21b28e6350ce252d16, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &191666370 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2254929100106748975, guid: fa12b84946083d14cb4447029910be28, type: 3} + m_PrefabInstance: {fileID: 191666367} + m_PrefabAsset: {fileID: 0} --- !u!1 &207499132 GameObject: m_ObjectHideFlags: 0 @@ -4403,7 +4411,6 @@ GameObject: - component: {fileID: 357746246} - component: {fileID: 357746248} - component: {fileID: 357746247} - - component: {fileID: 357746249} m_Layer: 5 m_Name: "\u5206\u6570 (1)" m_TagString: Untagged @@ -4472,21 +4479,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 357746245} m_CullTransparentMesh: 1 ---- !u!114 &357746249 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357746245} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f92172c6f4dd34947b81a7864de0de6f, type: 3} - m_Name: - m_EditorClassIdentifier: - overGame: {fileID: 357746245} - text: {fileID: 294718495} - scoreText: {fileID: 1561787732} --- !u!1 &367232219 GameObject: m_ObjectHideFlags: 0 @@ -16192,12 +16184,12 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1406223268} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 29a20ca670e09c849b79bec899abeb97, type: 3} m_Name: m_EditorClassIdentifier: - CompleteOverComponent: {fileID: 357746249} + CompleteOverComponent: {fileID: 1847624254} SubmitPlane: {fileID: 752036139} --- !u!1 &1420796210 GameObject: @@ -19833,7 +19825,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1662704226} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 357746245} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1662704226 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22339,6 +22343,21 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 178020885541006542, guid: fa12b84946083d14cb4447029910be28, type: 3} m_PrefabInstance: {fileID: 191666367} m_PrefabAsset: {fileID: 0} +--- !u!114 &1847624254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 191666370} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f92172c6f4dd34947b81a7864de0de6f, type: 3} + m_Name: + m_EditorClassIdentifier: + overGame: {fileID: 357746245} + text: {fileID: 294718495} + scoreText: {fileID: 1561787732} --- !u!1 &1882983958 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs b/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs index 289a64b2..d3c5b327 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs @@ -10,7 +10,7 @@ public class APIs /// /// 虚拟仿真考试提交分数 /// - public static string SimulationScore = PlayerPrefs.GetString("IP")+ "/pro/score/simulationScore"; + public static string SimulationScore = PlayerPrefs.GetString("IP")+ "/member/pro/score/simulationScore"; public static string queryByExamId = PlayerPrefs.GetString("IP") + "/proSimulationExamination/queryById?id="; diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index 9716d08c..ada5d073 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -589,7 +589,7 @@ namespace DefaultNamespace.ProcessMode public void OnUpdate() { - Debug.Log("==>当前得分:" + CalculateTotalScore()); + //Debug.Log("==>当前得分:" + CalculateTotalScore()); } public void OnDestroy() diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs index 417244d1..19f508d7 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs @@ -11,7 +11,7 @@ namespace ToolsPack public class ToolsPackSceneJump : MonoBehaviour { public string Scenename; - private string saveSN;//LY + static private string saveSN;//LY public void Start() { //学习模式下不能返回工具间 diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini index 2d108f20..ffd3c3bf 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini @@ -1 +1 @@ -2024-07-19 16:52:07#'ydcj://;cb,0,47,userId,username,token,90,-1,-1,http://ef0ba11.r27.cpolar.top;'| \ No newline at end of file +2024-07-19 16:52:07#'ydcj://;cb,1,47,userId,username,token,90,-1,-1,http://172.16.1.128:9206;'| \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/ToolManager.cs b/SXElectricityInformationAcquisition/Assets/ToolManager.cs index f4d75ab3..5225e906 100644 --- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs +++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs @@ -84,6 +84,7 @@ public class ToolManager : MonoBehaviour }); processBt.onClick.AddListener(delegate { + Debug.Log("ToolManager=>processBt"); ui.SetActive(false); }); MotionEngine.GetModule().OnStringEvent += HandleStringEvents;