From 8338b2dbc032487bfa34f1abc624dead9d598e7b Mon Sep 17 00:00:00 2001 From: yzx Date: Mon, 24 Jun 2024 14:29:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/Prefabs/APP.prefab | 108 +++++++++++++++++ .../Assets/Scenes/工具间Scenes/工具间.unity | 4 + .../Assets/Scenes/现场 _Test.unity | 20 +--- .../Assets/Scripts/MessageManager.cs | 4 +- .../ProcessMode/AnimationProcessManager.cs | 2 +- .../ProcessMode/SceneProcessLauncher.cs | 91 +-------------- .../DataConfig/SceneStepData.json | 12 +- .../Assets/ToolManager.cs | 2 +- .../Packages/packages-lock.json | 28 ++--- .../SXElectricityInformationAcquisition.sln | 109 +++++++----------- 10 files changed, 189 insertions(+), 191 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab index 9e2c96f1..a5e40fe7 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab @@ -527,6 +527,7 @@ RectTransform: - {fileID: 8014322703218229613} - {fileID: 7642526006322022173} - {fileID: 3097030627198115247} + - {fileID: 3069805421785455384} - {fileID: 9018075082424182618} - {fileID: 6780964861112113625} - {fileID: 3705230318444186014} @@ -2535,6 +2536,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SimulationOnEditor: 1 + sceneName: --- !u!1 &6053353591068959239 GameObject: m_ObjectHideFlags: 0 @@ -3877,6 +3879,112 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &4192932735562873502 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 178020885541006542} + m_Modifications: + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_SizeDelta.x + value: 404.1929 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_SizeDelta.y + value: 49.7903 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_AnchoredPosition.y + value: -240 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5229238823839807685, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_Name + value: Message + objectReference: {fileID: 0} + - target: {fileID: 5229238823839807685, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca1d05442d68a843ad0a2882714d471, type: 3} +--- !u!224 &3069805421785455384 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1200888659851862406, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + m_PrefabInstance: {fileID: 4192932735562873502} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5068678409163412235 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity index 09273071..0cd90c80 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity @@ -29585,6 +29585,10 @@ PrefabInstance: propertyPath: m_Name value: Message objectReference: {fileID: 0} + - target: {fileID: 5229238823839807685, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity index 32757104..376d7f5a 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity @@ -26249,6 +26249,10 @@ PrefabInstance: propertyPath: m_Name value: Message objectReference: {fileID: 0} + - target: {fileID: 5229238823839807685, guid: eca1d05442d68a843ad0a2882714d471, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -28027,7 +28031,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1516723168} - - component: {fileID: 1516723167} - component: {fileID: 1516723169} - component: {fileID: 1516723170} m_Layer: 0 @@ -28037,21 +28040,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1516723167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1516723166} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 51f73ee94f284a86b677a6bc74544094, type: 3} - m_Name: - m_EditorClassIdentifier: - _toolsPackScene: 0 - _processMode: 0 - messageGame: {fileID: 0} --- !u!4 &1516723168 Transform: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs index 939ac87d..32c96980 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs @@ -10,8 +10,10 @@ using UnityEngine; public class MessageManager : MonoBehaviour { public TMP_Text text; - void Start() + async void Start() { + + await Task.Delay(TimeSpan.FromSeconds(1)); if ( MotionEngine.GetModule().GetProcessMode() == ProcessMode.Teaching || MotionEngine.GetModule().GetProcessMode() == ProcessMode.Assessment) { this.gameObject.SetActive(false); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index 60478225..5f7240f4 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -534,7 +534,7 @@ namespace DefaultNamespace.ProcessMode AddProcess(currentMode.ToString()); - string json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/ToolsSceneStepData.json"); + string json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/SceneStepData.json"); StepsContainer stepsContainer = JsonConvert.DeserializeObject(json); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs index 6f34c96f..b11fe2ab 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Threading.Tasks; -using DefaultNamespace.Dto; -using DG.Tweening; -using MotionFramework; -using Newtonsoft.Json; + using UnityEngine; namespace DefaultNamespace.ProcessMode @@ -13,89 +6,9 @@ namespace DefaultNamespace.ProcessMode [ScriptDescription("场景的流程启动器")] public class SceneProcessLauncher : MonoBehaviour { - private AnimationProcessManager processManager; - [SerializeField] private ToolsPackScene _toolsPackScene; - [SerializeField] private ProcessMode _processMode; - - [SerializeField] private GameObject messageGame; - - private void Awake() + private void Start() { - processManager = MotionEngine.GetModule(); - - processManager.ClearProcess(); - - _processMode = MotionEngine.GetModule().GetProcessMode(); - - processManager.AddProcess(_processMode.ToString()); - - string json = ""; - - if (_toolsPackScene == ToolsPackScene.工具间) - { - json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/ToolsSceneStepData.json"); - } - else - { - json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/SceneStepData.json"); - } - - StepsContainer stepsContainer = JsonConvert.DeserializeObject(json); - - foreach (var stepData in stepsContainer.Steps) - { - List actions = new List(); - - foreach (var actionData in stepData.Actions) - { - List targetObjects = new List(); - foreach (var objectName in actionData.TargetObjects) - { - targetObjects.Add(objectName); - } - - Action action = () => { }; - actions.Add(new ActionWithDescription(targetObjects, action, actionData.Description, actionData.IsSequential, stepData.StepDescription)); - } - - AnimationStep step = new AnimationStep(stepData.StepDescription, stepData.Score, actions); - processManager.AddStepToProcess(_processMode.ToString(), step); - } - - if (_processMode == ProcessMode.Practice || _processMode == ProcessMode.Training) - { - messageGame.SetActive(true); - } - else - { messageGame.SetActive(false); - - } - - - //教学模式和培训模式需要初始化一下 - if (_processMode == ProcessMode.Teaching||_processMode == ProcessMode.Training) - InitializeFirstStep(); - - - - - - - } - - private void InitializeFirstStep() - { - MotionEngine.GetModule().SetCurrentMode(_processMode); - - if (MotionEngine.GetModule().CurrentProcess.Steps.Count > 0) - { - AnimationStep firstStep = MotionEngine.GetModule().CurrentProcess.Steps[0]; - if (firstStep.Actions.Count > 0) - { - MotionEngine.GetModule().HandleModeFeedback(_processMode, firstStep.Actions[0]); - } - } } } } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json index 20989656..e74cf5ef 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json @@ -23,7 +23,17 @@ "score": 0, "isSequential": false, "targetObjects": [ - "螺丝刀" + "螺丝刀", + "剥线钳", + "绝缘胶带", + "验电笔", + "盒装封印", + "安全帽", + "纱布手套", + "工作服", + "l型集中器", + "梯子", + "工作证" ] } ] diff --git a/SXElectricityInformationAcquisition/Assets/ToolManager.cs b/SXElectricityInformationAcquisition/Assets/ToolManager.cs index 989519c7..dfa44034 100644 --- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs +++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs @@ -96,7 +96,7 @@ public class ToolManager : MonoBehaviour // MotionEngine.GetModule().OnStringEvent -= HandleStringEvent; // Debug.Log("ϣ"); //} - Debug.Log("Ƿϣ" + RoleMove.instance.isup); + // Debug.Log("Ƿϣ" + RoleMove.instance.isup); } private void UIEvent() { diff --git a/SXElectricityInformationAcquisition/Packages/packages-lock.json b/SXElectricityInformationAcquisition/Packages/packages-lock.json index aa5b66b8..96ad547f 100644 --- a/SXElectricityInformationAcquisition/Packages/packages-lock.json +++ b/SXElectricityInformationAcquisition/Packages/packages-lock.json @@ -5,21 +5,21 @@ "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.feature.development": { "version": "1.0.1", @@ -42,7 +42,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -51,21 +51,21 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.postprocessing": { "version": "3.4.0", @@ -74,14 +74,14 @@ "dependencies": { "com.unity.modules.physics": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.settings-manager": { "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.test-framework": { "version": "1.1.33", @@ -92,7 +92,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { "version": "1.2.5", @@ -102,7 +102,7 @@ "com.unity.test-framework": "1.0.16", "com.unity.settings-manager": "1.0.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -111,7 +111,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.7.6", @@ -123,7 +123,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "1.0.0", @@ -142,7 +142,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln index 8618ec7c..1b37a01c 100644 --- a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln +++ b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln @@ -1,90 +1,63 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{70C866B3-6982-AEAE-4186-8220020279AA}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{b366c870-8269-aeae-4186-8220020279aa}" 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 -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 -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 -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 -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 -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 -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 -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 -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 -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 -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 -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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.Build.0 = Release|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.Build.0 = Release|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.Build.0 = Release|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.Build.0 = Release|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.Build.0 = Release|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.Build.0 = Release|Any CPU - {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89912F7C-9D47-5C67-B95E-C95F88C2A560}.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 + {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.Build.0 = Debug|Any CPU + {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.Build.0 = Debug|Any CPU + {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.Build.0 = Debug|Any CPU + {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.Build.0 = Debug|Any CPU + {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE