From fb623f632b6442fb98b321ff30f056a14d8fb34b Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Mon, 23 Sep 2024 09:50:42 +0800 Subject: [PATCH] 0923 --- .../Assets/Framework/GameLauncher.cs | 13 +- .../WebRequest/WebRequestManager.cs | 8 +- .../Assets/Scenes/Start.unity | 168 +++++++++- .../Assets/Scenes/鐜板満 _Test.unity | 31 +- .../Assets/Scripts/API/APIs.cs | 11 +- .../Assets/Scripts/CountdownTimer.cs | 23 +- .../Assets/Scripts/HQB/TeachingGotoScene.cs | 23 ++ .../Scripts/HQB/TeachingGotoScene.cs.meta | 11 + .../Assets/Scripts/IndicatorArrowComponent.cs | 3 +- .../Assets/Scripts/InfoDataManager.cs | 2 +- .../ProcessMode/AnimationProcessManager.cs | 35 ++- .../Assets/Scripts/UserInfoComponent.cs | 51 +++- .../StreamingAssets/DataConfig/0920.json | 287 ++++++++++++++++++ .../StreamingAssets/DataConfig/0920.json.meta | 7 + .../DataConfig/SceneStepData.json | 139 ++++++--- .../DataConfig/SceneStepData.json.meta | 2 +- .../Assets/StreamingAssets/info.ini | 2 +- .../Assets/taoruiqi/CompleteOverComponent.cs | 2 +- 18 files changed, 736 insertions(+), 82 deletions(-) create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs.meta create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json.meta diff --git a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs index cb040283..223dcbd1 100644 --- a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs @@ -59,13 +59,6 @@ public class GameLauncher : MonoBehaviour //加载消息框 MotionEngine.CreateModule(); - - //教学模式显示箭头和提示框 - if (MotionEngine.GetModule().GetProcessMode() != ProcessMode.Assessment) - { - this.GetComponent().Init(); - } - //修改模式 MotionEngine.GetModule().SetProcessMode(MotionEngine.GetModule().GetParsedData().SceneModel); @@ -77,6 +70,12 @@ public class GameLauncher : MonoBehaviour //初始化步骤流程 MotionEngine.GetModule().InitializeFirstStep(); + + //教学模式显示箭头和提示框 + if (MotionEngine.GetModule().GetProcessMode() != ProcessMode.Assessment)//HQB 0920 + { + this.GetComponent().Init(); + } } diff --git a/SXElectricityInformationAcquisition/Assets/Framework/Scripts/Runtime/Module/Module.Network/WebRequest/WebRequestManager.cs b/SXElectricityInformationAcquisition/Assets/Framework/Scripts/Runtime/Module/Module.Network/WebRequest/WebRequestManager.cs index 5ac134e9..59f85504 100644 --- a/SXElectricityInformationAcquisition/Assets/Framework/Scripts/Runtime/Module/Module.Network/WebRequest/WebRequestManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Framework/Scripts/Runtime/Module/Module.Network/WebRequest/WebRequestManager.cs @@ -20,10 +20,11 @@ namespace MotionFramework.Scripts.Runtime.Engine.Engine.Network.WebRequest /// /// /// - public async UniTask GetTextAsync(string url, Action onProgress = null, CancellationToken cancellationToken = default) + public async UniTask GetTextAsync(string url, string token, Action onProgress = null, CancellationToken cancellationToken = default) { using (UnityWebRequest request = UnityWebRequest.Get(url)) { + request.SetRequestHeader("auth_token", token); await SendRequestWithProgress(request, onProgress, cancellationToken); if (request.result == UnityWebRequest.Result.ConnectionError || request.result == UnityWebRequest.Result.ProtocolError) { @@ -238,15 +239,16 @@ namespace MotionFramework.Scripts.Runtime.Engine.Engine.Network.WebRequest /// /// /// - public async UniTask PostJsonAsync(string url, string jsonData, Action onProgress = null, CancellationToken cancellationToken = default) + public async UniTask PostJsonAsync(string url, string token, string jsonData, Action onProgress = null, CancellationToken cancellationToken = default) { + Debug.Log("提交试卷:" + url); using (UnityWebRequest request = new UnityWebRequest(url, UnityWebRequest.kHttpVerbPOST)) { byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData); request.uploadHandler = new UploadHandlerRaw(bodyRaw); request.downloadHandler = new DownloadHandlerBuffer(); request.SetRequestHeader("Content-Type", "application/json"); - + request.SetRequestHeader("auth_token", token);//HQB await SendRequestWithProgress(request, onProgress, cancellationToken); if (request.result == UnityWebRequest.Result.ConnectionError || request.result == UnityWebRequest.Result.ProtocolError) { diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity index 6c3e71d6..221e05e6 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity @@ -2322,6 +2322,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5901248756884239939, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: practiceTime + value: + objectReference: {fileID: 1127559886} - target: {fileID: 5913175448180373515, guid: fa12b84946083d14cb4447029910be28, type: 3} propertyPath: m_Sprite value: @@ -2484,7 +2488,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7027834050634466508, guid: fa12b84946083d14cb4447029910be28, type: 3} propertyPath: m_text - value: "\u5F20\u4E09\u4E09" + value: "\u5180\u5EFA\u6C11" + objectReference: {fileID: 0} + - target: {fileID: 7027834050634466508, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 01096d19d4ab6f14eab3c8bf2b08f541, type: 2} + - target: {fileID: 7027834050634466508, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_fontStyle + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7027834050634466508, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 3830445454110675045, guid: 01096d19d4ab6f14eab3c8bf2b08f541, type: 2} + - target: {fileID: 7027834050634466508, guid: fa12b84946083d14cb4447029910be28, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 objectReference: {fileID: 0} - target: {fileID: 7111662294929120867, guid: fa12b84946083d14cb4447029910be28, type: 3} propertyPath: m_Sprite @@ -2696,6 +2716,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3872295731099453067, guid: fa12b84946083d14cb4447029910be28, type: 3} insertIndex: -1 addedObject: {fileID: 1382749199} + - targetCorrespondingSourceObject: {fileID: 8040459939376544360, guid: fa12b84946083d14cb4447029910be28, type: 3} + insertIndex: 4 + addedObject: {fileID: 1127559885} - targetCorrespondingSourceObject: {fileID: 5439446738207451450, guid: fa12b84946083d14cb4447029910be28, type: 3} insertIndex: -1 addedObject: {fileID: 501902162} @@ -2708,7 +2731,7 @@ PrefabInstance: addedObject: {fileID: 1847624254} - targetCorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3} insertIndex: -1 - addedObject: {fileID: 1175298433} + addedObject: {fileID: 1175298439} - targetCorrespondingSourceObject: {fileID: 7261749442720430534, guid: fa12b84946083d14cb4447029910be28, type: 3} insertIndex: -1 addedObject: {fileID: 191666369} @@ -12295,6 +12318,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1123086041} m_CullTransparentMesh: 1 +--- !u!1 &1127559884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1127559885} + - component: {fileID: 1127559887} + - component: {fileID: 1127559886} + m_Layer: 0 + m_Name: "\u7EC3\u4E60\u4F7F\u7528\u65F6\u95F4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1127559885 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127559884} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1950461391} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 6.6477003, y: -39.599976} + m_SizeDelta: {x: 255.4846, y: 30.2964} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1127559886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127559884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 45138b4de74eb5a4b829ae598c8cb358, type: 2} + m_sharedMaterial: {fileID: 3942548801962692333, guid: 45138b4de74eb5a4b829ae598c8cb358, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4288237841 + m_fontColor: {r: 0.06666667, g: 0.31764707, b: 0.6, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1127559887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127559884} + m_CullTransparentMesh: 1 --- !u!1 &1134550762 GameObject: m_ObjectHideFlags: 0 @@ -12762,7 +12919,7 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5694174020841979734, guid: fa12b84946083d14cb4447029910be28, type: 3} m_PrefabInstance: {fileID: 191666367} m_PrefabAsset: {fileID: 0} ---- !u!114 &1175298433 +--- !u!114 &1175298439 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -23436,6 +23593,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1942579444} m_CullTransparentMesh: 1 +--- !u!224 &1950461391 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8040459939376544360, guid: fa12b84946083d14cb4447029910be28, type: 3} + m_PrefabInstance: {fileID: 191666367} + m_PrefabAsset: {fileID: 0} --- !u!1 &1953000207 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity index 0229be9a..3a79d65f 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity @@ -17588,6 +17588,7 @@ GameObject: - component: {fileID: 877326145} - component: {fileID: 877326144} - component: {fileID: 877326143} + - component: {fileID: 877326147} m_Layer: 5 m_Name: Canvas (2) m_TagString: Untagged @@ -17678,6 +17679,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &877326147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 877326142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4255571b6392ba843a3d004027992244, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &881447936 GameObject: m_ObjectHideFlags: 0 @@ -17703,14 +17716,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 881447936} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0.04180079, y: 0.21903005, z: 0.0076662716, w: 0.97479224} m_LocalPosition: {x: 0, y: 0, z: -860.5} m_LocalScale: {x: 0.071971, y: 0.071971, z: 0.071971} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 593568343} m_Father: {fileID: 314679705} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -4.868, y: 25.336, z: -0.194} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 26.3, y: 7.68} @@ -35309,7 +35322,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalPosition.x - value: 304.15 + value: 306.99 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalPosition.y @@ -35317,11 +35330,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalPosition.z - value: 168.04 + value: 164.18 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalRotation.x @@ -35329,7 +35342,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalRotation.z @@ -35341,7 +35354,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -35501,7 +35514,7 @@ Transform: m_GameObject: {fileID: 1810323351} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 303.59, y: 1.14, z: 163.544} + m_LocalPosition: {x: 305.61, y: 1.14, z: 163.544} m_LocalScale: {x: 4.2154512, y: 1.9946195, z: 3.9705188} m_ConstrainProportionsScale: 0 m_Children: [] @@ -35573,7 +35586,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.9429537, y: 0.27271962, z: 1.4630866} + m_Size: {x: 1.68, y: 0.27271962, z: 1.4630866} m_Center: {x: 0.0028089092, y: -0.36363685, z: 0.23154095} --- !u!23 &1810323356 MeshRenderer: diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs b/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs index 82b82a00..868a4ff7 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/API/APIs.cs @@ -5,13 +5,16 @@ using UnityEngine; public class APIs { - + /// /// 铏氭嫙浠跨湡鑰冭瘯鎻愪氦鍒嗘暟 /// - public static string SimulationScore = PlayerPrefs.GetString("IP")+ "/member/pro/score/simulationScore"; - - +#if UNITY_EDITOR + public static string SimulationScore = PlayerPrefs.GetString("IP") + "/member/pro/score/simulationScore"; public static string queryByExamId = PlayerPrefs.GetString("IP") + "/member/proSimulationExamination/queryById?id="; +#else + public static string SimulationScore = PlayerPrefs.GetString("IP")+ "/pro/score/simulationScore"; + public static string queryByExamId = PlayerPrefs.GetString("IP") + "/proSimulationExamination/queryById?id="; +#endif } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/CountdownTimer.cs b/SXElectricityInformationAcquisition/Assets/Scripts/CountdownTimer.cs index 8ac0366b..ecf1cfe8 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/CountdownTimer.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/CountdownTimer.cs @@ -20,8 +20,9 @@ public class CountdownTimer : MonoBehaviour } private async UniTaskVoid StartCountdown() - { - for (int i = countdownTime; i >= 0; i--) + { + int i = countdownTime; + for (; i >= 0; i--) { countdownText.text = $"{i}s"; countdownImage.fillAmount = (float)i / countdownTime; @@ -31,11 +32,17 @@ public class CountdownTimer : MonoBehaviour countdownText.text = $"0s"; countdownImage.fillAmount = 0; + + if (i <= 0) + { + //鍊掕鏃剁粨鏉熼鍑虹▼搴 + Application.Quit(); + } } - -// #if !UNITY_EDITOR -// -// #else -// Application.Quit(); -// #endif + + // #if !UNITY_EDITOR + // + // #else + // Application.Quit(); + // #endif } diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs new file mode 100644 index 00000000..6bbd5fc1 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs @@ -0,0 +1,23 @@ +using DefaultNamespace; +using DefaultNamespace.ProcessMode; +using MotionFramework; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TeachingGotoScene : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + if (MotionEngine.GetModule().GetProcessMode() == ProcessMode.Teaching || + MotionEngine.GetModule().GetProcessMode() == ProcessMode.Training)//HQB + MotionEngine.GetModule().HandleClick("前往现场"); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs.meta new file mode 100644 index 00000000..7315960f --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/TeachingGotoScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4255571b6392ba843a3d004027992244 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs index 53daf791..e0fcc480 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs @@ -31,7 +31,8 @@ public class IndicatorArrowComponent : MonoBehaviour teachingModePrompt.SetActive(true); MotionEngine.GetModule().OnTeachingPromptsObjects += TeachingPromptsObjects; - if (MotionEngine.GetModule().GetProcessMode() == ProcessMode.Teaching)//LY闄や簡鏁欏妯″紡閮藉脊鍑烘彁绀 + if (MotionEngine.GetModule().GetProcessMode() == ProcessMode.Teaching + || MotionEngine.GetModule().GetProcessMode() == ProcessMode.Training)//LY闄や簡鏁欏妯″紡閮藉脊鍑烘彁绀 { MotionEngine.GetModule().OnStepProcessDescriptionMessage += OnSendMessagePrompt; } diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs index 0801ceea..80f153b3 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs @@ -71,7 +71,7 @@ public class InfoDataManager : ModuleSingleton, IModule _parsedData.SceneModel = int.Parse(dataElements[1]); _parsedData.ExamId = int.Parse(dataElements[2]); _parsedData.UserId = dataElements[3]; - _parsedData.Username = dataElements[4]; + _parsedData.Username = WWW.UnEscapeURL(dataElements[4], System.Text.Encoding.UTF8); _parsedData.Token = dataElements[5]; _parsedData.UserTime = int.Parse(dataElements[6]); _parsedData.ClassId = int.Parse(dataElements[7]); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index 5f8d9c24..4cee0428 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -1,7 +1,11 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; +using System.Runtime.Remoting.Metadata.W3cXsd2001; +using System.Security.Cryptography; +using System.Security.Policy; using System.Threading.Tasks; using Cysharp.Threading.Tasks; using DefaultNamespace.Dto; @@ -10,7 +14,9 @@ using MotionFramework; using MotionFramework.Scripts.Runtime.Engine.Engine.Network.WebRequest; using Newtonsoft.Json; using Unity.VisualScripting; +using Unity.VisualScripting.Antlr3.Runtime; using UnityEngine; +using UnityEngine.Networking; using UnityEngine.UI; using Type = System.Type; @@ -65,6 +71,14 @@ namespace DefaultNamespace.ProcessMode /// public event StepProcessDescriptionMessage OnStepProcessDescriptionMessage; + /// + /// HQB 鏇存柊token + /// + /// + public Coroutine updateTokenCor; + public float updateTime = 270.0f; + public float updateTimeIter = 270.0f; + // /// // /// 鏁欏妯″紡鎻愮ず // /// @@ -546,6 +560,7 @@ namespace DefaultNamespace.ProcessMode float sco = step.Score / step.Actions[0].TargetObjects.Count; Debug.Log("姣忎釜鐗╀綋鐨勫垎鏁--->" + sco); float zong = step.Score - sco * value.Count; + if (zong < 0) zong = 0;//HQB姝ラ鍒嗘渶浣庢墸鍒0 totalScore += zong; Debug.Log("鎵ｇ殑鍒嗘暟--->" + (step.Score - sco * value.Count)); Debug.Log($"姝ラ {stepIndex + 1} 閿欒鐐瑰嚮鐨勭墿浣: {string.Join(", ", value)}"); @@ -577,6 +592,7 @@ namespace DefaultNamespace.ProcessMode _submitScoreSteps.Add(sub); } + if (totalScore < 0)totalScore = 0;//HQB闃叉鎺夊埌0浠ヤ笅 Debug.Log($"鎬诲垎: {totalScore}"); return (int)totalScore; } @@ -587,8 +603,17 @@ namespace DefaultNamespace.ProcessMode _incorrectClicksPerStep = new Dictionary>(); } - public void OnUpdate() + public async void OnUpdate() { + updateTimeIter -= Time.deltaTime; + if (updateTimeIter <= 0.0f) + { + //HQB 鏇存柊token + Debug.Log("鏇存柊token"); + int kaoID = MotionEngine.GetModule().GetParsedData().ExamId; + string re = await MotionEngine.GetModule().GetTextAsync(APIs.queryByExamId + kaoID, MotionEngine.GetModule().GetParsedData().Token, null); + updateTimeIter = updateTime; + } //Debug.Log("==>褰撳墠寰楀垎锛" + CalculateTotalScore()); } @@ -604,13 +629,15 @@ namespace DefaultNamespace.ProcessMode { try { + Debug.Log("缃戠粶鍒濆鍖"); + int kaoID = MotionEngine.GetModule().GetParsedData().ExamId; - Debug.Log(APIs.queryByExamId + kaoID); + Debug.Log("缃戠粶鍦板潃涓猴細" + APIs.queryByExamId + kaoID); - string json = await MotionEngine.GetModule().GetTextAsync(APIs.queryByExamId + kaoID, null); + string json = await MotionEngine.GetModule().GetTextAsync(APIs.queryByExamId + kaoID, MotionEngine.GetModule().GetParsedData().Token, null); - Debug.Log("鑾峰彇寰楄冭瘯棰樼洰---->" + json); + Debug.Log("Token锛" + MotionEngine.GetModule().GetParsedData().Token + " 鑾峰彇寰楄冭瘯棰樼洰---->" + json); SceneStepData _sceneStepData = JsonConvert.DeserializeObject(json); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/UserInfoComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/UserInfoComponent.cs index e2f83e45..b73bc53a 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/UserInfoComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/UserInfoComponent.cs @@ -19,9 +19,13 @@ public class UserInfoComponent : MonoBehaviour public TMP_Text processDescribe; public TMP_Text processMessage; public TMP_Text gameTime; + public TMP_Text practiceTime; //HQB锛岀粌涔犱娇鐢ㄦ椂闂 + private int practiceUsedTime = 0; + private bool startPracticeTime = false; public GameObject SubmitBt; + private int totalSubmitTime = 120; public void Init() { @@ -29,6 +33,11 @@ public class UserInfoComponent : MonoBehaviour } + public void OnDisable() + { + MotionEngine.GetModule().OnStepProcessMessage -= SendMessagePrompt; + } + private void Start() { @@ -48,6 +57,7 @@ public class UserInfoComponent : MonoBehaviour ParsedData parsedData = MotionEngine.GetModule().GetParsedData(); ProcessMode pm = MotionEngine.GetModule().GetProcessMode(); gameTime.gameObject.SetActive(false); + practiceTime.gameObject.SetActive(false);//HQB processMessage.gameObject.SetActive(true); SubmitBt.SetActive(true); switch (pm) @@ -56,10 +66,12 @@ public class UserInfoComponent : MonoBehaviour processDescribe.text = "妯″紡锛氭暀瀛﹀疄璁"; SubmitBt.SetActive(false); break; case ProcessMode.Training: - processDescribe.text = "妯″紡锛氬煿璁疄璁"; + processDescribe.text = "妯″紡锛氬煿璁疄璁"; SubmitBt.SetActive(false);//HQB0920 break; case ProcessMode.Practice: processDescribe.text = "妯″紡锛氱粌涔犲疄璁"; + processMessage.gameObject.SetActive(false); + practiceTime.gameObject.SetActive(true);//HQB break; case ProcessMode.Assessment: processDescribe.text = "妯″紡锛氳冩牳妯″紡"; @@ -75,9 +87,31 @@ public class UserInfoComponent : MonoBehaviour username.text = parsedData.Username; int totalTime = parsedData.UserTime * 60; - await Countdown(totalTime); + if (MotionEngine.GetModule().GetProcessMode() == ProcessMode.Practice) + await CountPracticeTime(); + else if (MotionEngine.GetModule().GetProcessMode() == ProcessMode.Assessment) + await Countdown(totalTime); } + private async UniTask CountPracticeTime() + { + practiceUsedTime = 0; + startPracticeTime = true; + while (startPracticeTime) + { + practiceUsedTime++; + int minutes = practiceUsedTime / 60; + int seconds = practiceUsedTime % 60; + + string formattedMinutes = minutes < 10 ? "0" + minutes.ToString() : minutes.ToString(); + string formattedSeconds = seconds < 10 ? "0" + seconds.ToString() : seconds.ToString(); + + practiceTime.text = $"宸茬敤鏃堕棿锛歿formattedMinutes}:{formattedSeconds}"; + await UniTask.Delay(TimeSpan.FromSeconds(1)); + } + } + + private async UniTask Countdown(int totalTime) { while (totalTime > 5395) @@ -85,6 +119,7 @@ public class UserInfoComponent : MonoBehaviour totalTime--; int minutes = totalTime / 60; int seconds = totalTime % 60; + totalSubmitTime = totalTime; string formattedMinutes = minutes < 10 ? "0" + minutes.ToString() : minutes.ToString(); string formattedSeconds = seconds < 10 ? "0" + seconds.ToString() : seconds.ToString(); @@ -98,6 +133,7 @@ public class UserInfoComponent : MonoBehaviour public async void Submit() { + startPracticeTime = false; ParsedData parsedData = MotionEngine.GetModule().GetParsedData(); @@ -109,14 +145,19 @@ public class UserInfoComponent : MonoBehaviour sub.userId = parsedData.UserId; sub.examId = parsedData.ExamId; sub.classId = parsedData.ClassId; - sub.useTime = parsedData.UserTime.ToString(); + sub.useTime = (parsedData.UserTime * 60 - totalSubmitTime).ToString(); //parsedData.UserTime.ToString();//鐢ㄦ椂涓嶅 sub.examClassId = parsedData.ExamClassId.ToString(); sub.stepList = MotionEngine.GetModule().GetSubmitScoreStepList(); string js = JsonConvert.SerializeObject(sub); - Debug.Log(js); - string json = await MotionEngine.GetModule().PostJsonAsync(APIs.SimulationScore, js, (ste) => { }); + Debug.Log("浜ゅ嵎" + js); + string json = await MotionEngine.GetModule().PostJsonAsync(APIs.SimulationScore, MotionEngine.GetModule().GetParsedData().Token, js, (ste) => { }); + if (json == null) + { + MotionEngine.GetModule().OpenMessageWindow("鍒嗘暟涓婁紶澶辫触", MessageTypeEnum.Error); + } + Debug.Log(json); } } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json new file mode 100644 index 00000000..274b2b36 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json @@ -0,0 +1,287 @@ +{ + "steps": [ + { + "stepDescription": "濉啓宸ヤ綔绁", + "score": 10, + "actions": [ + { + "description": "閫夋嫨", + "score": 10, + "isUI": false, + "isSequential": true, + "targetObjects": [ + "宸ヤ綔鍗" + ] + } + ] + }, + { + "stepDescription": "棰嗗彇宸ュ櫒鍏峰強浠櫒璁惧", + "score": 20, + "actions": [ + { + "description": "棰嗗彇", + "score": 20, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "铻轰笣鍒", + "鍓ョ嚎閽", + "缁濈紭鑳跺甫", + "楠岀數绗", + "鐩掕灏佸嵃", + "瀹夊叏甯", + "绾卞竷鎵嬪", + "宸ヤ綔鏈", + "l鍨嬮泦涓櫒", + "姊瓙", + "宸ヤ綔璇" + ] + } + ] + }, + { + "stepDescription": "浣╂埓瑁呭妫瑙", + "score": 5, + "actions": [ + { + "description": "浣╂埓瑁呭鍓嶅線", + "score": 5, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "姊冲闀" + ] + } + ] + }, + { + "stepDescription": "鍓嶅線鐜板満", + "score": 10, + "actions": [ + { + "description": "鍓嶅線鐜板満鍚庨渶瑕佷笌瀹㈡埛娌熼", + "score": 10, + "isUI": false, + "isSequential": true, + "targetObjects": [ + "瀹㈡埛" + ] + } + ] + }, + { + "stepDescription": "楠岀數", + "score": 10, + "actions": [ + { + "description": "楠岀數绗旈獙鐢", + "score": 10, + "isUI": false, + "isSequential": true, + "targetObjects": [ + "鎻掑骇", + "绠变綋", + "鎻掑骇" + ] + } + ] + }, + { + "stepDescription": "鏌滈棬灏佸嵃", + "score": 0, + "actions": [ + { + "description": "鍓ョ嚎閽虫墦寮", + "score": 0, + "isUI": false, + "isSequential": true, + "targetObjects": [ + "鏌滈棬_灏佸嵃" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "鎵撳紑鎺ョ嚎鐩掞紝璋冩暣鎷ㄧ墖", + "score": 4, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "鎺ョ嚎鐩抇灏佸嵃R", + "鎺ョ嚎鐩抇灏佸嵃L", + "鐩朹鍥哄畾铻轰笣_Rup", + "鍥哄畾铻轰笣_Ldown", + "鎺ョ嚎鐩掔旱鍚戞粦鍧004", + "鎺ョ嚎鐩掓í鍚戜笂婊戝潡003", + "鎺ョ嚎鐩掔旱鍚戞粦鍧003", + "鎺ョ嚎鐩掓í鍚戜笂婊戝潡001", + "鎺ョ嚎鐩掔旱鍚戞粦鍧002", + "鎺ョ嚎鐩掓í鍚戜笂婊戝潡002", + "鎺ョ嚎鐩掔旱鍚戞粦鍧001" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "鎵撳紑闆嗕腑鍣ㄧ洅瀛", + "score": 4, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "闆嗕腑鍣╛灏佸嵃R", + "闆嗕腑鍣╛灏佸嵃_L", + "澹冲浐瀹氳灪涓漘R", + "澹冲浐瀹氳灪涓漘L" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "铻轰笣鍒鎵紑", + "score": 4, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "JZQ_铻轰笣001", + "JZQ_铻轰笣0011", + "JZQ_铻轰笣002", + "JZQ_铻轰笣0022", + "JZQ_铻轰笣003", + "JZQ_铻轰笣0033", + "JZQ_铻轰笣004", + "JZQ_铻轰笣0044", + "JZQ_铻轰笣006", + "JZQ_铻轰笣005" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "缁濈紭鑳跺甫缁", + "score": 4, + "isUI": false, + "isSequential": true, + "targetObjects": [ + "pCylinder170" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "铻轰笣鍒鎵紑", + "score": 4, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "鍥哄畾铻轰笣_Rdown", + "闆嗙數鍣ㄥ浐瀹氳灪涓漘Ldown" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "鏇存崲", + "score": 4, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "鏂扮殑闆嗕腑鍣ㄧ鎾" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 4, + "actions": [ + { + "description": "铻轰笣鍒涓", + "score": 4, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "JZQ_铻轰笣1", + "JZQ_铻轰笣2", + "JZQ_铻轰笣3", + "JZQ_铻轰笣4", + "JZQ_铻轰笣6", + "JZQ_铻轰笣7" + ] + } + ] + }, + { + "stepDescription": "涓存椂鐢ㄧ數", + "score": 10, + "actions": [ + { + "description": "鎵撳紑", + "score": 10, + "isUI": true, + "isSequential": false, + "targetObjects": [ + "涓存椂鐢ㄧ數" + ] + } + ] + }, + { + "stepDescription": "鍔犺灏佸嵃", + "score": 0, + "actions": [ + { + "description": "鐩栦笂鐩掔洊", + "score": 0, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "鐩朹閫忔槑澶栧３" + ] + } + ] + }, + { + "stepDescription": "鍔犺灏佸嵃", + "score": 7, + "actions": [ + { + "description": "鍔犺灏佸嵃", + "score": 7, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "閫忔槑鐩栧瓙灏佸嵃纰版挒R", + "閫忔槑鐩栧瓙灏佸嵃纰版挒L", + "鍙樼數绠盻闂", + "鏌滈棬鍗℃爴" + ] + } + ] + } + ] +} diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json.meta b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json.meta new file mode 100644 index 00000000..97460281 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/0920.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c903293fea9015444815f60be6003cc6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json index 274b2b36..1aaa2c7a 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json @@ -6,7 +6,7 @@ "actions": [ { "description": "閫夋嫨", - "score": 10, + "score": 0, "isUI": false, "isSequential": true, "targetObjects": [ @@ -21,7 +21,7 @@ "actions": [ { "description": "棰嗗彇", - "score": 20, + "score": 30, "isUI": false, "isSequential": false, "targetObjects": [ @@ -46,7 +46,7 @@ "actions": [ { "description": "浣╂埓瑁呭鍓嶅線", - "score": 5, + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ @@ -57,11 +57,26 @@ }, { "stepDescription": "鍓嶅線鐜板満", - "score": 10, + "score": 5, "actions": [ { - "description": "鍓嶅線鐜板満鍚庨渶瑕佷笌瀹㈡埛娌熼", - "score": 10, + "description": "鐐瑰嚮鎸夐挳 ", + "score": 0, + "isUI": true, + "isSequential": false, + "targetObjects": [ + "鍓嶅線鐜板満" + ] + } + ] + }, + { + "stepDescription": "鍓嶅線鐜板満", + "score": 5, + "actions": [ + { + "description": "鍓嶅線", + "score": 0, "isUI": false, "isSequential": true, "targetObjects": [ @@ -76,7 +91,7 @@ "actions": [ { "description": "楠岀數绗旈獙鐢", - "score": 10, + "score": 0, "isUI": false, "isSequential": true, "targetObjects": [ @@ -89,7 +104,7 @@ }, { "stepDescription": "鏌滈棬灏佸嵃", - "score": 0, + "score": 3.11, "actions": [ { "description": "鍓ョ嚎閽虫墦寮", @@ -104,18 +119,46 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.11, "actions": [ { - "description": "鎵撳紑鎺ョ嚎鐩掞紝璋冩暣鎷ㄧ墖", - "score": 4, + "description": "鍓ョ嚎閽虫洿鎹", + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ "鎺ョ嚎鐩抇灏佸嵃R", - "鎺ョ嚎鐩抇灏佸嵃L", + "鎺ョ嚎鐩抇灏佸嵃L" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 3.11, + "actions": [ + { + "description": "铻轰笣鍒鎵紑", + "score": 0, + "isUI": false, + "isSequential": false, + "targetObjects": [ "鐩朹鍥哄畾铻轰笣_Rup", - "鍥哄畾铻轰笣_Ldown", + "鍥哄畾铻轰笣_Ldown" + ] + } + ] + }, + { + "stepDescription": "鏇存崲闆嗕腑鍣", + "score": 3.11, + "actions": [ + { + "description": "婊戝姩", + "score": 0, + "isUI": false, + "isSequential": true, + "targetObjects": [ "鎺ョ嚎鐩掔旱鍚戞粦鍧004", "鎺ョ嚎鐩掓í鍚戜笂婊戝潡003", "鎺ョ嚎鐩掔旱鍚戞粦鍧003", @@ -129,11 +172,11 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.11, "actions": [ { - "description": "鎵撳紑闆嗕腑鍣ㄧ洅瀛", - "score": 4, + "description": "铻轰笣鍒鎵紑", + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ @@ -147,11 +190,11 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.11, "actions": [ { "description": "铻轰笣鍒鎵紑", - "score": 4, + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ @@ -171,11 +214,11 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.11, "actions": [ { "description": "缁濈紭鑳跺甫缁", - "score": 4, + "score": 0, "isUI": false, "isSequential": true, "targetObjects": [ @@ -186,11 +229,11 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.11, "actions": [ { "description": "铻轰笣鍒鎵紑", - "score": 4, + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ @@ -202,11 +245,11 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.11, "actions": [ { "description": "鏇存崲", - "score": 4, + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ @@ -217,11 +260,11 @@ }, { "stepDescription": "鏇存崲闆嗕腑鍣", - "score": 4, + "score": 3.12, "actions": [ { "description": "铻轰笣鍒涓", - "score": 4, + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ @@ -237,11 +280,11 @@ }, { "stepDescription": "涓存椂鐢ㄧ數", - "score": 10, + "score": 5, "actions": [ { "description": "鎵撳紑", - "score": 10, + "score": 0, "isUI": true, "isSequential": false, "targetObjects": [ @@ -252,10 +295,10 @@ }, { "stepDescription": "鍔犺灏佸嵃", - "score": 0, + "score": 1.4, "actions": [ { - "description": "鐩栦笂鐩掔洊", + "description": "鍔犺灏佸嵃", "score": 0, "isUI": false, "isSequential": false, @@ -267,17 +310,45 @@ }, { "stepDescription": "鍔犺灏佸嵃", - "score": 7, + "score": 1.4, "actions": [ { "description": "鍔犺灏佸嵃", - "score": 7, + "score": 0, "isUI": false, "isSequential": false, "targetObjects": [ "閫忔槑鐩栧瓙灏佸嵃纰版挒R", - "閫忔槑鐩栧瓙灏佸嵃纰版挒L", - "鍙樼數绠盻闂", + "閫忔槑鐩栧瓙灏佸嵃纰版挒L" + ] + } + ] + }, + { + "stepDescription": "鍔犺灏佸嵃", + "score": 1.4, + "actions": [ + { + "description": "鍔犺灏佸嵃", + "score": 0, + "isUI": false, + "isSequential": false, + "targetObjects": [ + "鍙樼數绠盻闂" + ] + } + ] + }, + { + "stepDescription": "鍔犺灏佸嵃", + "score": 1.4, + "actions": [ + { + "description": "鍔犺灏佸嵃", + "score": 0, + "isUI": false, + "isSequential": false, + "targetObjects": [ "鏌滈棬鍗℃爴" ] } diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json.meta b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json.meta index 97460281..977b3d7a 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json.meta +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c903293fea9015444815f60be6003cc6 +guid: 8165da38a652cba47b1d10c759031e38 DefaultImporter: externalObjects: {} userData: diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini index 28e2ba2b..e665076a 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini @@ -1 +1 @@ -2024-07-19 16:52:07#'ydcj://;cb,1,47,cf9d56cd0e8545389b0ff134d4f846b4,username1,token,90,-1,688,http://172.16.1.128:9206;'| \ No newline at end of file +2024-07-19 16:52:07#'ydcj://;cb,3,47,cf9d56cd0e8545389b0ff134d4f846b4,%E6%9D%8E%E4%BA%AC%E6%98%8C,token,90,-1,688,http://172.16.1.128:9206;'| \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/CompleteOverComponent.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/CompleteOverComponent.cs index 3fcfbaee..f23ef0e0 100644 --- a/SXElectricityInformationAcquisition/Assets/taoruiqi/CompleteOverComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/CompleteOverComponent.cs @@ -16,7 +16,7 @@ public class CompleteOverComponent : MonoBehaviour void Start() { - MotionEngine.GetModule().HandleClick("鍓嶅線鐜板満"); + //MotionEngine.GetModule().HandleClick("鍓嶅線鐜板満");//HQB MotionEngine.GetModule().OnCompleteEvent += CompleteEvent; }