Compare commits

...

2 Commits

Author SHA1 Message Date
yzx 798549b5f9 Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition
# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
#	SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/StepData.json
2024-06-13 14:51:12 +08:00
yzx 55edaf3b7f 提交 2024-06-13 14:50:45 +08:00
10 changed files with 712 additions and 1138 deletions

File diff suppressed because it is too large Load Diff

View File

@ -24,12 +24,10 @@ public class GameLauncher : MonoBehaviour
#if !UNITY_EDITOR #if !UNITY_EDITOR
SimulationOnEditor = false; SimulationOnEditor = false;
#endif #endif
// 놓迦뺏왠齡憩 // 놓迦뺏왠齡憩
if (Application.isEditor || Debug.isDebugBuild) if (Application.isEditor || Debug.isDebugBuild)
DeveloperConsole.Initialize(); DeveloperConsole.Initialize();
// 놓迦뺏움솥 // 놓迦뺏움솥
MotionEngine.Initialize(this, HandleMotionFrameworkLog); MotionEngine.Initialize(this, HandleMotionFrameworkLog);
} }
@ -38,7 +36,6 @@ public class GameLauncher : MonoBehaviour
// 눼쉔踏狗친욥 // 눼쉔踏狗친욥
CreateGameModules(); CreateGameModules();
//SceneManager.LoadScene("묏야쇌"); //SceneManager.LoadScene("묏야쇌");
} }
void Update() void Update()

View File

@ -2205,6 +2205,7 @@ GameObject:
- component: {fileID: 505215070} - component: {fileID: 505215070}
- component: {fileID: 505215071} - component: {fileID: 505215071}
- component: {fileID: 505215072} - component: {fileID: 505215072}
- component: {fileID: 505215073}
m_Layer: 0 m_Layer: 0
m_Name: APP m_Name: APP
m_TagString: Untagged m_TagString: Untagged
@ -2273,6 +2274,18 @@ MonoBehaviour:
- {fileID: 1593693333} - {fileID: 1593693333}
- {fileID: 1615943081} - {fileID: 1615943081}
- {fileID: 1771654382} - {fileID: 1771654382}
--- !u!114 &505215073
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 505215068}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0d3b1a9715a34aa8ab0530af2056aaf9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &520819557 --- !u!1001 &520819557
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -12,7 +12,6 @@ namespace DefaultNamespace
private string ToolsPackDataPath = Application.streamingAssetsPath + "/DataConfig/ToolsPackData.json"; //工具包 private string ToolsPackDataPath = Application.streamingAssetsPath + "/DataConfig/ToolsPackData.json"; //工具包
private string TeachingDataPath = Application.streamingAssetsPath + "/DataConfig/TeachingData.json"; //教学工具包设备高亮数据 private string TeachingDataPath = Application.streamingAssetsPath + "/DataConfig/TeachingData.json"; //教学工具包设备高亮数据
private Dictionary<string, List<string>> toolsPackDict; private Dictionary<string, List<string>> toolsPackDict;
private List<string> teachingData; private List<string> teachingData;

View File

@ -0,0 +1,26 @@
namespace DefaultNamespace.Dto
{
using System.Collections.Generic;
public class EnergyWorkList
{
public string keywork { get; set; }
public string valuework { get; set; }
}
public class EnergyInformation
{
public string work { get; set; }
public List<EnergyWorkList> worklist { get; set; }
}
public class SceneData
{
public string scenename { get; set; }
public string questbooks { get; set; }
public string userinformation { get; set; }
public string energyinformation { get; set; }
public List<EnergyInformation> energylist { get; set; }
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 6a73a546f3e543eca4db6c788cba105a
timeCreated: 1718243950

View File

@ -0,0 +1,81 @@
using System;
using DefaultNamespace.Dto;
using Newtonsoft.Json;
using UnityEngine;
namespace ToolsPack
{
public class ToolsSceneData : MonoBehaviour
{
private void Start()
{
string json = @"
{
'scenename': '',
'questbooks': '',
'userinformation': '',
'energyinformation': '',
'energylist': [
{
'work': '',
'worklist': [
{'keywork': '总', 'valuework': '630732.86'},
{'keywork': '尖', 'valuework': '0'},
{'keywork': '峰', 'valuework': '600227.02'},
{'keywork': '平', 'valuework': '0'},
{'keywork': '谷', 'valuework': '30505.84'}
]
},
{
'work': '',
'worklist': [
{'keywork': '总', 'valuework': '90704.72'},
{'keywork': '尖', 'valuework': '0'},
{'keywork': '峰', 'valuework': '82394.39'},
{'keywork': '平', 'valuework': '0'},
{'keywork': '谷', 'valuework': '8310.33'}
]
},
{
'work': '',
'worklist': [
{'keywork': '总', 'valuework': '0'},
{'keywork': '尖', 'valuework': '0'},
{'keywork': '峰', 'valuework': '0'},
{'keywork': '平', 'valuework': '0'},
{'keywork': '谷', 'valuework': '0'}
]
},
{
'work': '',
'worklist': [
{'keywork': '总', 'valuework': '18385.2'},
{'keywork': '尖', 'valuework': '0'},
{'keywork': '峰', 'valuework': '13222.55'},
{'keywork': '平', 'valuework': '0'},
{'keywork': '谷', 'valuework': '5162.65'}
]
}
]
}";
// 解析JSON字符串
SceneData sceneData = JsonConvert.DeserializeObject<SceneData>(json);
// 输出一些数据来验证解析
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}");
}
}
}
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0d3b1a9715a34aa8ab0530af2056aaf9
timeCreated: 1718244118

View File

@ -1,90 +1,63 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 15 # Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{70C866B3-6982-AEAE-4186-8220020279AA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{b366c870-8269-aeae-4186-8220020279aa}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{328AEAE8-36DB-0919-A8A7-26F06060F4D3}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{e8ea8a32-db36-1909-a8a7-26f06060f4d3}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{D8880EA9-DBBA-9941-850A-29EEEE6B3832}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{a90e88d8-badb-4199-850a-29eeee6b3832}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{431CD62F-2442-CB9F-8A4A-9397608E2318}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{2fd61c43-4224-9fcb-8a4a-9397608e2318}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{edefe799-dc28-4dd2-3165-1acb9e1a5d82}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{775d4e80-7b8a-c113-e64a-f0327b5a51d2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{89912F7C-9D47-5C67-B95E-C95F88C2A560}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{7c2f9189-479d-675c-b95e-c95f88c2a560}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{8526E427-FBAD-A00A-06E3-F5025D183005}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{27e42685-adfb-0aa0-06e3-f5025d183005}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{4d0abe3e-2eff-5141-cb61-b756eb38b78b}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{bae393ca-b3f2-035c-979c-ff7e0d806194}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{2D23DF76-3788-F610-4EB2-65D4B80D2C66}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{76df232d-8837-10f6-4eb2-65d4b80d2c66}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{5569EEC5-5613-62FE-795C-07A46B224741}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{c5ee6955-1356-fe62-795c-07a46b224741}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{53349ADB-6DD3-9261-985B-3E8CC856B5BD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{db9a3453-d36d-6192-985b-3e8cc856b5bd}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.ActiveCfg = Release|Any CPU {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.Build.0 = Release|Any CPU {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.Build.0 = Debug|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.ActiveCfg = Release|Any CPU {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.Build.0 = Release|Any CPU {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.Build.0 = Debug|Any CPU {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.ActiveCfg = Release|Any CPU {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.Build.0 = Release|Any CPU {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.Build.0 = Debug|Any CPU {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.Build.0 = Debug|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.ActiveCfg = Release|Any CPU {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.Build.0 = Release|Any CPU {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.Build.0 = Debug|Any CPU {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.ActiveCfg = Release|Any CPU {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.Build.0 = Release|Any CPU {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.ActiveCfg = Release|Any CPU {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.Build.0 = Release|Any CPU {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.Build.0 = Debug|Any CPU {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.Build.0 = Release|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.Build.0 = Release|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.Build.0 = Release|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.Build.0 = Release|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.Build.0 = Release|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.Build.0 = Release|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE