diff --git a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs index 59b8e61f..22c36de7 100644 --- a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs @@ -52,9 +52,6 @@ public class GameLauncher : MonoBehaviour private void CreateGameModules() { - // 创建事件管理器 - MotionEngine.CreateModule(); - //webrequest管理器 MotionEngine.CreateModule(); @@ -67,6 +64,9 @@ public class GameLauncher : MonoBehaviour //流程管理器 MotionEngine.CreateModule(); + //加载配置信息 + MotionEngine.CreateModule(); + } private void HandleMotionFrameworkLog(ELogLevel logLevel, string log) diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab index 1ab0dba3..433a2c4c 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab @@ -1627,6 +1627,7 @@ GameObject: - component: {fileID: 8410584963409699975} - component: {fileID: 328384968636471287} - component: {fileID: 3034258414160536299} + - component: {fileID: 5355724877285991378} m_Layer: 5 m_Name: "\u6D41\u7A0B\u7ED3\u675F" m_TagString: Untagged @@ -1696,6 +1697,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5355724877285991378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3749027150314622874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c663c5e4a9134a54b80d0e2a913c31e2, type: 3} + m_Name: + m_EditorClassIdentifier: + confirmBt: {fileID: 7246041337635750621} --- !u!1 &3769303647029597975 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity index c249edf2..19591a0f 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/鐜板満 _Test.unity @@ -13824,7 +13824,7 @@ GameObject: m_Component: - component: {fileID: 654503842} m_Layer: 0 - m_Name: "\u4E34\u65F6\u7528\u7535 (1)" + m_Name: "\u73B0\u573A\u8C03\u8BD5" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -25488,37 +25488,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1231888216} m_CullTransparentMesh: 1 ---- !u!1 &1235900275 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1235900276} - m_Layer: 0 - m_Name: "\u4E34\u65F6\u7528\u7535 (2)" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1235900276 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1235900275} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 103.43629, y: -2.6000328, z: -527.04504} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1238574002 GameObject: m_ObjectHideFlags: 0 @@ -237829,4 +237798,3 @@ SceneRoots: - {fileID: 1199227227} - {fileID: 912118588} - {fileID: 654503842} - - {fileID: 1235900276} diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ConsumePowerManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ConsumePowerManager.cs new file mode 100644 index 00000000..8a7ce8f7 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ConsumePowerManager.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using DefaultNamespace.ProcessMode; +using MotionFramework; +using UnityEngine; +using UnityEngine.UI; + +public class ConsumePowerManager : MonoBehaviour +{ + public Button confirmBt; + void Start() + { + confirmBt.onClick.AddListener(delegate + { + MotionEngine.GetModule().HandleClick(GameObject.Find("涓存椂鐢ㄧ數")); + MotionEngine.GetModule().HandleClick(GameObject.Find("鐜板満璋冭瘯")); + }); + } + +} diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ConsumePowerManager.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/ConsumePowerManager.cs.meta new file mode 100644 index 00000000..dd1ea6dd --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ConsumePowerManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c663c5e4a9134a54b80d0e2a913c31e2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs index ba967b3b..7f8ecca9 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs @@ -15,10 +15,14 @@ namespace DefaultNamespace private Dictionary> toolsPackDict; private List teachingData; + + [SerializeField] private ProcessMode.ProcessMode _processMode; + + public void OnCreate(object createParam) { LoadConfig(); - + // LoadTeachingData(); } @@ -34,6 +38,35 @@ namespace DefaultNamespace { } + public void SetProcessMode(int index) + { + if (index == 0) + { + _processMode = DefaultNamespace.ProcessMode.ProcessMode.Teaching; + } + else if (index == 1) + { + _processMode = DefaultNamespace.ProcessMode.ProcessMode.Training; + } + else if (index == 2) + { + _processMode = DefaultNamespace.ProcessMode.ProcessMode.Practice; + } + else if (index == 3) + { + _processMode = DefaultNamespace.ProcessMode.ProcessMode.Assessment; + } + + + + Debug.Log("褰撳墠娴佺▼妯″紡---->"+_processMode); + } + + public ProcessMode.ProcessMode GetProcessMode() + { + return _processMode; + } + /// /// 鑾峰彇鏁欏宸ュ叿鍖呰澶囬珮浜暟鎹 /// diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs new file mode 100644 index 00000000..f0c6122d --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs @@ -0,0 +1,88 @@ +using System.Collections; +using System.Collections.Generic; +using DefaultNamespace; +using MotionFramework; +using UnityEngine; + +public class InfoDataManager : ModuleSingleton, IModule +{ + private void ParseFileContent(string content) + { + // 棣栧厛鎸夌収 # 杩涜鍒嗗壊锛岃幏鍙栨棩鏈熷拰鏁版嵁閮ㄥ垎 + var parts = content.Split('#'); + if (parts.Length < 2) + { + Debug.LogError("Invalid file format."); + return; + } + + // 鏃ユ湡閮ㄥ垎 + string date = parts[0]; + Debug.Log("Date: " + date); + + // 鏁版嵁閮ㄥ垎 + string dataPart = parts[1]; + // 杩涗竴姝ュ垎鍓叉暟鎹儴鍒 + var dataSections = dataPart.Split(';'); + + if (dataSections.Length < 2) + { + Debug.LogError("Invalid data format."); + return; + } + + // 绗竴閮ㄥ垎 sxfz:// + string prefix = dataSections[0]; + Debug.Log("Prefix: " + prefix); + + // 绗簩閮ㄥ垎 lyht,0,18,userId,username,token,90 + string dataSection = dataSections[1]; + var dataElements = dataSection.Split(','); + + if (dataElements.Length < 7) + { + Debug.LogError("Invalid data section format."); + return; + } + + string code = dataElements[0]; + string value1 = dataElements[1]; + string value2 = dataElements[2]; + string userId = dataElements[3]; + string username = dataElements[4]; + string token = dataElements[5]; + string value3 = dataElements[6]; + + Debug.Log("Code: " + code); + Debug.Log("Value 1: " + value1); + Debug.Log("Value 2: " + value2); + Debug.Log("User ID: " + userId); + Debug.Log("Username: " + username); + Debug.Log("Token: " + token); + Debug.Log("Value 3: " + value3); + + + + MotionEngine.GetModule().SetProcessMode(int.Parse(value1)); + + + } + + public void OnCreate(object createParam) + { + string content = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/info.ini"); + ParseFileContent(content); + } + + public void OnUpdate() + { + } + + public void OnDestroy() + { + } + + public void OnGUI() + { + } +} diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs.meta new file mode 100644 index 00000000..f7330b63 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Scripts/InfoDataManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 914ec2cdc53f2a1478e39f34127e766d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index eef555af..dd5efccb 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -33,11 +33,14 @@ namespace DefaultNamespace.ProcessMode public void AddProcess(string type) { - if (!processes.ContainsKey(type)) - { - processes[type] = new AnimationProcess(type); - Enum.TryParse(type, true, out currentMode); - } + // if (!processes.ContainsKey(type)) + // { + // processes[type] = new AnimationProcess(type); + // Enum.TryParse(type, true, out currentMode); + // } + + processes[type] = new AnimationProcess(type); + Enum.TryParse(type, true, out currentMode); } public void ClearProcess() diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs index fd7be1f9..aef4df16 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs @@ -20,15 +20,13 @@ namespace DefaultNamespace.ProcessMode { await Task.Delay(TimeSpan.FromSeconds(1)); - - processManager = MotionEngine.GetModule(); processManager.ClearProcess(); - processManager.AddProcess("Training"); + processManager.AddProcess(MotionEngine.GetModule().GetProcessMode().ToString()); string json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/SceneStepData.json"); StepsContainer stepsContainer = JsonConvert.DeserializeObject(json); @@ -58,7 +56,7 @@ namespace DefaultNamespace.ProcessMode } AnimationStep step = new AnimationStep(stepData.StepDescription, stepData.Score, actions); - processManager.AddStepToProcess("Training", step); + processManager.AddStepToProcess(MotionEngine.GetModule().GetProcessMode().ToString(), step); } InitializeFirstStep(); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneData.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneData.cs index 9cce968b..96c123a4 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneData.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneData.cs @@ -61,21 +61,21 @@ namespace ToolsPack // 瑙f瀽JSON瀛楃涓 SceneData sceneData = JsonConvert.DeserializeObject(json); - - // 杈撳嚭涓浜涙暟鎹潵楠岃瘉瑙f瀽 - Debug.Log("鍦烘櫙鍚嶇О: " + sceneData.scenename); - Debug.Log("浠诲姟鎻忚堪: " + sceneData.questbooks); - Debug.Log("鐢ㄦ埛淇℃伅: " + sceneData.userinformation); - Debug.Log("鐢佃兘琛ㄤ俊鎭: " + sceneData.energyinformation); - - foreach (var energy in sceneData.energylist) - { - Debug.Log("Work: " + energy.work); - foreach (var worklist in energy.worklist) - { - Debug.Log($"Key: {worklist.keywork}, Value: {worklist.valuework}"); - } - } + // + // // 杈撳嚭涓浜涙暟鎹潵楠岃瘉瑙f瀽 + // Debug.Log("鍦烘櫙鍚嶇О: " + sceneData.scenename); + // Debug.Log("浠诲姟鎻忚堪: " + sceneData.questbooks); + // Debug.Log("鐢ㄦ埛淇℃伅: " + sceneData.userinformation); + // Debug.Log("鐢佃兘琛ㄤ俊鎭: " + sceneData.energyinformation); + // + // foreach (var energy in sceneData.energylist) + // { + // Debug.Log("Work: " + energy.work); + // foreach (var worklist in energy.worklist) + // { + // Debug.Log($"Key: {worklist.keywork}, Value: {worklist.valuework}"); + // } + // } } } } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs index bc4812b3..b0f44a31 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; +using DefaultNamespace; using DefaultNamespace.Dto; using DefaultNamespace.ProcessMode; using MotionFramework; @@ -29,7 +30,7 @@ namespace ToolsPack processManager.ClearProcess(); - processManager.AddProcess("Training"); + processManager.AddProcess( MotionEngine.GetModule().GetProcessMode().ToString()); string json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/ToolsSceneStepData.json"); StepsContainer stepsContainer = JsonConvert.DeserializeObject(json); @@ -60,7 +61,7 @@ namespace ToolsPack } AnimationStep step = new AnimationStep(stepData.StepDescription, stepData.Score, actions); - processManager.AddStepToProcess("Training", step); + processManager.AddStepToProcess(MotionEngine.GetModule().GetProcessMode().ToString(), step); } InitializeFirstStep(); @@ -69,15 +70,14 @@ namespace ToolsPack private void InitializeFirstStep() { - ProcessMode initialMode = ProcessMode.Training; // 鍋囪鍒濆妯″紡鏄暀瀛︽ā寮 - MotionEngine.GetModule().SetCurrentMode(initialMode); + MotionEngine.GetModule().SetCurrentMode(MotionEngine.GetModule().GetProcessMode()); if (MotionEngine.GetModule().CurrentProcess.Steps.Count > 0) { AnimationStep firstStep = MotionEngine.GetModule().CurrentProcess.Steps[0]; if (firstStep.Actions.Count > 0) { - MotionEngine.GetModule().PrepareNextStep(initialMode, firstStep.Actions[0]); + MotionEngine.GetModule().PrepareNextStep(MotionEngine.GetModule().GetProcessMode(), firstStep.Actions[0]); } } } diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json index bda4d02f..85dbc300 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json @@ -264,6 +264,7 @@ "鐩朹閫忔槑澶栧3" ] }, + { "description": "鐐瑰嚮鏌滈棬鍗℃爴杩樺師鍏抽棬", "score": 0, diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini index f540e18b..8c122fae 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini @@ -1 +1 @@ -2024-06-14 15:04:12#'sxfz://;lyht,0,18,userId,username,token,90;/'| \ No newline at end of file +2024-06-14 15:04:12#'sxfz://;lyht,1,18,userId,username,token,90;/'| \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/DisplayKnapsackObjects.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/DisplayKnapsackObjects.cs index a402e94b..7e890695 100644 --- a/SXElectricityInformationAcquisition/Assets/taoruiqi/DisplayKnapsackObjects.cs +++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/DisplayKnapsackObjects.cs @@ -59,8 +59,7 @@ public class DisplayKnapsackObjects : MonoBehaviour }); processBt.onClick.AddListener(delegate { - MotionEngine.GetModule().HandleClick(processBt.gameObject); - MotionEngine.GetModule().HandleClick(processBt.gameObject); + ui.SetActive(false); }); } diff --git a/SXElectricityInformationAcquisition/ProjectSettings/ProjectSettings.asset b/SXElectricityInformationAcquisition/ProjectSettings/ProjectSettings.asset index 209fe2cb..5a6e2bca 100644 --- a/SXElectricityInformationAcquisition/ProjectSettings/ProjectSettings.asset +++ b/SXElectricityInformationAcquisition/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: SXElectricityInformationAcquisition + companyName: App + productName: App defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}