From 8eb5cfe2bcad6ece4ba543e1d80cb1a90c0d39c2 Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Mon, 8 Sep 2025 12:03:11 +0900 Subject: [PATCH] asdf --- ...ontaiiner.prefab => Sink_Container.prefab} | 2 +- ...prefab.meta => Sink_Container.prefab.meta} | 0 ...Sink_Contaiiner.png => Sink_Container.png} | Bin ...iiner.png.meta => Sink_Container.png.meta} | 0 Assets/Resources/MQTTConfig.json | 2 +- Assets/Resources/WebConfig.json | 4 +- .../simulation_model_infos_list.json | 1 + .../simulation_model_infos_list.json.meta | 7 + .../simulation_model_infos_list_add.json | 3 + .../simulation_model_infos_list_add.json.meta | 7 + Assets/Scenes/Simulation_0.0.1.unity | 45 +++ Assets/Scripts/Manager/DataManager.cs | 5 + Assets/Scripts/ObjectRoot.cs | 15 + Assets/Scripts/ObjectRoot.cs.meta | 2 + .../SimulationModels/SimulationModelMove.cs | 258 ++++++++---------- .../SimulationModelProcess.cs | 34 ++- Assets/Scripts/UI/UIDragSpawner.cs | 6 +- Assets/Scripts/Web/WebReceiver.cs | 47 +++- .../Scripts/scene/SaveLoad/SaveLoadmanager.cs | 196 ++++++------- Assets/Settings/PC_Low.asset | 3 +- ...niversalRenderPipelineGlobalSettings.asset | 240 ++++++++-------- ProjectSettings/GraphicsSettings.asset | 2 +- 22 files changed, 508 insertions(+), 371 deletions(-) rename Assets/Resources/Library/LibraryPrefab/{Sink_Contaiiner.prefab => Sink_Container.prefab} (99%) rename Assets/Resources/Library/LibraryPrefab/{Sink_Contaiiner.prefab.meta => Sink_Container.prefab.meta} (100%) rename Assets/Resources/Library/LibraryThumbnails/{Sink_Contaiiner.png => Sink_Container.png} (100%) rename Assets/Resources/Library/LibraryThumbnails/{Sink_Contaiiner.png.meta => Sink_Container.png.meta} (100%) create mode 100644 Assets/Resources/simulation_model_infos_list.json create mode 100644 Assets/Resources/simulation_model_infos_list.json.meta create mode 100644 Assets/Resources/simulation_model_infos_list_add.json create mode 100644 Assets/Resources/simulation_model_infos_list_add.json.meta create mode 100644 Assets/Scripts/ObjectRoot.cs create mode 100644 Assets/Scripts/ObjectRoot.cs.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Sink_Contaiiner.prefab b/Assets/Resources/Library/LibraryPrefab/Sink_Container.prefab similarity index 99% rename from Assets/Resources/Library/LibraryPrefab/Sink_Contaiiner.prefab rename to Assets/Resources/Library/LibraryPrefab/Sink_Container.prefab index 62037d6d..b9546dec 100644 --- a/Assets/Resources/Library/LibraryPrefab/Sink_Contaiiner.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Sink_Container.prefab @@ -42,7 +42,7 @@ GameObject: - component: {fileID: 8916579774980777993} - component: {fileID: 7603118197445908879} m_Layer: 0 - m_Name: Sink_Contaiiner + m_Name: Sink_Container m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Library/LibraryPrefab/Sink_Contaiiner.prefab.meta b/Assets/Resources/Library/LibraryPrefab/Sink_Container.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Sink_Contaiiner.prefab.meta rename to Assets/Resources/Library/LibraryPrefab/Sink_Container.prefab.meta diff --git a/Assets/Resources/Library/LibraryThumbnails/Sink_Contaiiner.png b/Assets/Resources/Library/LibraryThumbnails/Sink_Container.png similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Sink_Contaiiner.png rename to Assets/Resources/Library/LibraryThumbnails/Sink_Container.png diff --git a/Assets/Resources/Library/LibraryThumbnails/Sink_Contaiiner.png.meta b/Assets/Resources/Library/LibraryThumbnails/Sink_Container.png.meta similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Sink_Contaiiner.png.meta rename to Assets/Resources/Library/LibraryThumbnails/Sink_Container.png.meta diff --git a/Assets/Resources/MQTTConfig.json b/Assets/Resources/MQTTConfig.json index 74b4e298..4a998efc 100644 --- a/Assets/Resources/MQTTConfig.json +++ b/Assets/Resources/MQTTConfig.json @@ -5,7 +5,7 @@ //"host": "220.90.135.42", "host": "simulator.flexing.ai", //"port": 3016, - "port": 8889 + "port": 8886 //"host": "localhost", //"port": 9001 } diff --git a/Assets/Resources/WebConfig.json b/Assets/Resources/WebConfig.json index 51971a11..d00b0ac0 100644 --- a/Assets/Resources/WebConfig.json +++ b/Assets/Resources/WebConfig.json @@ -1,11 +1,11 @@ { "configs": [ { - "host": "https://simulator.flexing.ai/server", + "host": "https://simulator.flexing.ai:449/server", //"host": "http://220.90.135.122", //"port": 3000, //"port": 3037, - "port": 3030, + "port": 3036, "accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcmlkIjoic3lzdGVtIiwibmFtZSI6IuyLnOyKpO2FnOq0gOumrOyekCIsImF1dGgiOiJzeXN0ZW0iLCJjb21wYW55SWQiOm51bGwsImlhdCI6MTczNTYwOTgyOCwiZXhwIjoxNzcxNjA5ODI4fQ.ApXLL_RsWWaa2KwRKrg1z8iT9MNYdZFqN-6Mn1Lvq8Q" //"accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcmlkIjoic3lzdGVtIiwibmFtZSI6IuyLnOyKpO2FnOq0gOumrOyekCIsImF1dGgiOiJzeXN0ZW0iLCJjb21wYW55SWQiOm51bGwsImlhdCI6MTc0ODM5NjM4MSwiZXhwIjoxNzg0Mzk2MzgxfQ.CfkXRWx-JvQKop0RiYYoQoYRpfm7LiiKp0xdhUfRFM4" } diff --git a/Assets/Resources/simulation_model_infos_list.json b/Assets/Resources/simulation_model_infos_list.json new file mode 100644 index 00000000..95350374 --- /dev/null +++ b/Assets/Resources/simulation_model_infos_list.json @@ -0,0 +1 @@ +{ "info": "{\n \"modelInfos\": [\n {\n \"prefabName\": \"Move_Conv\",\n \"modelName\": \"AssemblyLine\",\n \"modelType\": null,\n \"objectName\": \"AssemblyLine_0\",\n \"modelID\": \"\",\n \"nodeID\": \"conveyor_0_bc033016-9b9d-4fec-8eaa-8ef92c4bfe84\",\n \"position\": \"(21.31, 0.00, -0.75)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Store_BufferRack\",\n \"modelName\": \"BufferRack\",\n \"modelType\": null,\n \"objectName\": \"BufferRack_0\",\n \"modelID\": \"\",\n \"nodeID\": \"store_0_c3ee9fa4-3461-4042-8ec4-4d31c3dc26e8\",\n \"position\": \"(31.12, 0.00, -1.11)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Sink_Contaiiner\",\n \"modelName\": \"Container\",\n \"modelType\": null,\n \"objectName\": \"Container_0\",\n \"modelID\": \"\",\n \"nodeID\": \"sink_0_18910e87-7a20-46fc-932b-46e3444005e2\",\n \"position\": \"(66.76, 0.00, -0.74)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Move_ForkLift\",\n \"modelName\": \"ForkLift\",\n \"modelType\": null,\n \"objectName\": \"ForkLift_0\",\n \"modelID\": \"\",\n \"nodeID\": \"move_0_677fd86c-cbdc-4570-89e5-b0b2df307036\",\n \"position\": \"(47.01, 0.00, -5.80)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Process_Machine\",\n \"modelName\": \"Machine\",\n \"modelType\": null,\n \"objectName\": \"Machine_0\",\n \"modelID\": \"\",\n \"nodeID\": \"processor_0_00ba5f00-b3d2-4be9-959c-7e7b5994b21d\",\n \"position\": \"(10.57, 0.00, -0.58)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Process_Machine\",\n \"modelName\": \"Machine\",\n \"modelType\": null,\n \"objectName\": \"Machine_1\",\n \"modelID\": \"\",\n \"nodeID\": \"processor_0_89e89b2d-03bb-46b1-b259-c03a9a65f153\",\n \"position\": \"(38.83, 0.00, -0.98)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Source_Pallet\",\n \"modelName\": \"Pallet\",\n \"modelType\": null,\n \"objectName\": \"Pallet_0\",\n \"modelID\": \"\",\n \"nodeID\": \"source_0_fad1bc92-e55a-4a77-8c29-791511fdf565\",\n \"position\": \"(0.00, 0.00, 0.00)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Queue_pallet\",\n \"modelName\": \"QPallet\",\n \"modelType\": null,\n \"objectName\": \"QPallet_0\",\n \"modelID\": \"\",\n \"nodeID\": \"queue_0_1faf23c8-9e87-430c-b135-4639c0ad0b94\",\n \"position\": \"(4.88, 0.00, -0.37)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Queue_pallet\",\n \"modelName\": \"QPallet\",\n \"modelType\": null,\n \"objectName\": \"QPallet_1\",\n \"modelID\": \"\",\n \"nodeID\": \"queue_0_878cb3da-e0b5-4a94-8f0b-1a94aa0ad8f6\",\n \"position\": \"(14.91, 0.00, -0.40)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Queue_pallet\",\n \"modelName\": \"QPallet\",\n \"modelType\": null,\n \"objectName\": \"QPallet_2\",\n \"modelID\": \"\",\n \"nodeID\": \"queue_0_32a16d45-6953-4051-90d8-718d0ddcf0b2\",\n \"position\": \"(41.74, 0.00, -0.29)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Store_Rack_NoCrane\",\n \"modelName\": \"Rack(NoCrane)\",\n \"modelType\": null,\n \"objectName\": \"Rack(NoCrane)_0\",\n \"modelID\": \"\",\n \"nodeID\": \"store_0_5d4c8c52-65dd-4c8c-b1a9-98aa9e1506d0\",\n \"position\": \"(57.09, 0.00, -1.08)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Resource_Worker\",\n \"modelName\": \"Worker\",\n \"modelType\": null,\n \"objectName\": \"Worker_0\",\n \"modelID\": \"\",\n \"nodeID\": \"resource_0_de11c98a-9372-418c-b03e-2e8e8c4c9bfa\",\n \"position\": \"(11.50, 0.00, -7.45)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Resource_Worker\",\n \"modelName\": \"Worker\",\n \"modelType\": null,\n \"objectName\": \"Worker_1\",\n \"modelID\": \"\",\n \"nodeID\": \"resource_0_7779d3a0-d71a-447a-899a-f4bca5f4d3d1\",\n \"position\": \"(38.54, 0.00, -6.55)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n }\n ],\n \"cameraPositionInfo\": {\n \"position\": \"(34.30, 33.09, -34.83)\",\n \"rotation\": \"(37.80, 0.60, 0.00)\"\n }\n}" } \ No newline at end of file diff --git a/Assets/Resources/simulation_model_infos_list.json.meta b/Assets/Resources/simulation_model_infos_list.json.meta new file mode 100644 index 00000000..13ef85d7 --- /dev/null +++ b/Assets/Resources/simulation_model_infos_list.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 583197c528398aa4fb92130352c2f543 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/simulation_model_infos_list_add.json b/Assets/Resources/simulation_model_infos_list_add.json new file mode 100644 index 00000000..45061b26 --- /dev/null +++ b/Assets/Resources/simulation_model_infos_list_add.json @@ -0,0 +1,3 @@ +{ + "info": "{\n \"modelInfos\": [\n {\n \"prefabName\": \"Resource_Worker\",\n \"modelName\": \"Worker\",\n \"modelType\": null,\n \"objectName\": \"Worker_0\",\n \"modelID\": \"resource_agv\",\n \"nodeID\": \"resource_agv\",\n \"position\": \"(12.15, 0.00, -14.85)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Move_ForkLift\",\n \"modelName\": \"ForkLift\",\n \"modelType\": null,\n \"objectName\": \"ForkLift_0\",\n \"modelID\": \"move_agv_1\",\n \"nodeID\": \"move_agv_1\",\n \"position\": \"(30.15, 0.00, -3.15)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n },\n {\n \"prefabName\": \"Move_ForkLift\",\n \"modelName\": \"ForkLift\",\n \"modelType\": null,\n \"objectName\": \"ForkLift_1\",\n \"modelID\": \"move_agv_2\",\n \"nodeID\": \"move_agv_2\",\n \"position\": \"(30.15, 0.00, -8.55)\",\n \"rotation\": \"(0.00000, 0.00000, 0.00000, 1.00000)\",\n \"scale\": \"(1.00, 1.00, 1.00)\"\n }\n ],\n \"cameraPositionInfo\": {\n \"position\": \"(21.15, 40.00, -70.00)\",\n \"rotation\": \"(25.00, 0.00, 0.00)\"\n }\n}" +} \ No newline at end of file diff --git a/Assets/Resources/simulation_model_infos_list_add.json.meta b/Assets/Resources/simulation_model_infos_list_add.json.meta new file mode 100644 index 00000000..be49b1be --- /dev/null +++ b/Assets/Resources/simulation_model_infos_list_add.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d59fca3282133d043a063adbb24b1402 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index 1f4781ac..5355ac80 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -4267,6 +4267,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1759367627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1759367629} + - component: {fileID: 1759367628} + m_Layer: 0 + m_Name: ObjectRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1759367628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759367627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fef7ceac746e6c4e87e7b66a5716af7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1759367629 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759367627} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1872009196 GameObject: m_ObjectHideFlags: 0 @@ -5379,3 +5423,4 @@ SceneRoots: - {fileID: 941336964} - {fileID: 28956631} - {fileID: 18823863} + - {fileID: 1759367629} diff --git a/Assets/Scripts/Manager/DataManager.cs b/Assets/Scripts/Manager/DataManager.cs index 3ec685ab..c6a31d75 100644 --- a/Assets/Scripts/Manager/DataManager.cs +++ b/Assets/Scripts/Manager/DataManager.cs @@ -57,4 +57,9 @@ public class DataManager : UnitySingleton SimulationModel model = models.Find(x => x.nodeID.Equals(nodeID)); return model; } + + public void ResetModels() + { + models.Clear(); + } } diff --git a/Assets/Scripts/ObjectRoot.cs b/Assets/Scripts/ObjectRoot.cs new file mode 100644 index 00000000..d334f429 --- /dev/null +++ b/Assets/Scripts/ObjectRoot.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +public class ObjectRoot : UnitySingleton +{ + public void ClearChildren(bool immediate = false) + { + DataManager.I.ResetModels(); + for (int i = transform.childCount - 1; i >= 0; i--) + { + var child = transform.GetChild(i).gameObject; + + Destroy(child); + } + } +} diff --git a/Assets/Scripts/ObjectRoot.cs.meta b/Assets/Scripts/ObjectRoot.cs.meta new file mode 100644 index 00000000..6c156bc2 --- /dev/null +++ b/Assets/Scripts/ObjectRoot.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9fef7ceac746e6c4e87e7b66a5716af7 \ No newline at end of file diff --git a/Assets/Scripts/SimulationModels/SimulationModelMove.cs b/Assets/Scripts/SimulationModels/SimulationModelMove.cs index 54a7cbee..fab19179 100644 --- a/Assets/Scripts/SimulationModels/SimulationModelMove.cs +++ b/Assets/Scripts/SimulationModels/SimulationModelMove.cs @@ -141,16 +141,18 @@ public class statisticsMove { public int total_moved; } + +public enum UnLoadingState +{ + store, + queue, + defectStore, + defectQueue +} #endregion public class SimulationModelMove : SimulationModel { - string eventLoading = "move_loading"; - string eventMove = "move_moving"; - string eventUnloading = "move_unloading"; - string eventSpeed = "move_speed_factor_applied"; - string eventReturning = "move_returning"; - [Header("Transport")] public List listProducts = new List(); public Transform productPos; @@ -234,142 +236,40 @@ public class SimulationModelMove : SimulationModel var wrapclass = JsonConvert.DeserializeObject(data); if (wrapclass == null || string.IsNullOrEmpty(wrapclass._event)) return; - /* - string eventLoading = "move_loading"; - string eventMove = "move_moving"; - string eventUnloading = "move_unloading"; - string eventSpeed = "move_speed_factor_applied"; - string eventReturning = "move_returning"; - */ + switch (wrapclass._event) { case "move_loading": LoadingCargo(wrapclass.data.ToString()); - break; + break; case "move_moving": Moving(wrapclass.data.ToString()); - break; - case "move_unloading": - break; - case "move_speed_factor_applied": - break; - case "move_returning": break; - } - if (wrapclass._event.Contains(eventMove)) - { - var moveData_Move = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - elapsedTime = 0; - arrivalTime = moveData_Move.time; - originalPos = transform.position; - prevPos = transform.position; - - if (moveData_Move.input.queues != null && moveData_Move.input.queues.Count >= 1) - { - string queueID = moveData_Move.input.queues[0].ToString(); - SimulationModel model = DataManager.I.GetModel(queueID); - SimulationModelStore storeModel = model.GetComponent(); - origin = storeModel.GetTransporterPosition(); - } - else if (moveData_Move.input.stores != null && moveData_Move.input.stores.Count >= 1) - { - string storeID = moveData_Move.input.stores[0].ToString(); - SimulationModel model = DataManager.I.GetModel(storeID); - SimulationModelStore storeModel = model.GetComponent(); - origin = storeModel.GetTransporterPosition(); - } - - if (!string.IsNullOrEmpty(moveData_Move.output.queue)) - { - SimulationModel model = DataManager.I.GetModel(moveData_Move.output.queue); - SimulationModelStore storeModel = model.GetComponent(); - destination = storeModel.GetTransporterPosition(); - } - else if (!string.IsNullOrEmpty(moveData_Move.output.store)) - { - SimulationModel model = DataManager.I.GetModel(moveData_Move.output.store); - SimulationModelStore storeModel = model.GetComponent(); - destination = storeModel.GetTransporterPosition(); - } - } - else if (wrapclass._event.Contains(eventUnloading)) - { - string targetID = ""; - - if (wrapclass._event.Contains("defect_store")) - { - var moveData_unLoading = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - targetID = moveData_unLoading.store_name; - } - else if (wrapclass._event.Contains("defect")) - { - var moveData_unLoading = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - targetID = moveData_unLoading.output_queue; - } - else if (wrapclass._event.Contains("unloading_store")) - { - //Debug.Log(wrapclass.data.ToString()); - var moveData_unLoading = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - targetID = moveData_unLoading.store_name; - } - else - { - var moveData_unLoading = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - targetID = moveData_unLoading.output_queue; - } - - var model = DataManager.I.GetModel(targetID); - if(model == null) - { - Debug.LogWarning($"Datamanager Model Null!!!!! TargetID:{targetID}"); - return; - } - SimulationModelStore storeModel = model.GetComponent(); - - if (listProducts.Count > 0) - { - GameObject product = listProducts[0]; - //storeModel.StoreProduct(product); - listProducts.Remove(product); - Destroy(product); - } - else - { - Debug.LogWarning("Trying to unload from empty transporter : " + nodeID); - } - } - if (wrapclass._event.Contains("move_arrived")) - { - var moveData_arrived = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - currentCount -= moveData_arrived.count; - SetBubble(currentCount); - } - if (wrapclass._event.Contains(eventSpeed)) - { - var moveData_Speed = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - float originalTime = moveData_Speed.original; - float adjustedTime = moveData_Speed.adjusted; - arrivalTime += adjustedTime - originalTime; - elapsedTime = 0; - originalPos = transform.position; - prevPos = transform.position; - } - if (wrapclass._event.Contains(eventReturning)) - { - var moveData_Return = JsonConvert.DeserializeObject(wrapclass.data.ToString()); - elapsedTime = 0; - arrivalTime = moveData_Return.return_time; - originalPos = transform.position; - prevPos = transform.position; - if (origin != null) - { - destination = origin; - } - } - if (wrapclass._event.Contains("move_statistics_update")) - { - totalMoved = JsonConvert.DeserializeObject(wrapclass.data.ToString()).statistics.total_moved; - SetBubble(totalMoved); + case "move_unloading": + Unloading(wrapclass.data.ToString(), UnLoadingState.queue); + break; + case "move_unloading_store": + Unloading(wrapclass.data.ToString(), UnLoadingState.store); + break; + case "move_unloading_defect": + Unloading(wrapclass.data.ToString(), UnLoadingState.defectQueue); + break; + case "move_unloading_defect_store": + Unloading(wrapclass.data.ToString(), UnLoadingState.defectStore); + break; + case "move_arrived": + Arrive(wrapclass.data.ToString()); + break; + case "move_speed_factor_applied": + SpeedFactorApply(wrapclass.data.ToString()); + break; + case "move_returning": + Returning(wrapclass.data.ToString()); + break; + case "move_statistics_update": + totalMoved = JsonConvert.DeserializeObject(wrapclass.data.ToString()).statistics.total_moved; + SetBubble(totalMoved); + break; } } @@ -411,7 +311,6 @@ public class SimulationModelMove : SimulationModel originalPos = transform.position; prevPos = transform.position; - // origin 설정 (입력 큐 / 스토어) string inputId = GetFirstNonEmpty(moveData.input?.queues, moveData.input?.stores); if (!string.IsNullOrEmpty(inputId)) { @@ -420,7 +319,6 @@ public class SimulationModelMove : SimulationModel origin = model.GetTransporterPosition(); } - // destination 설정 (출력 큐 / 스토어) if (!string.IsNullOrEmpty(moveData.output?.queue)) { var model = DataManager.I.GetModel(moveData.output.queue) as SimulationModelStore; @@ -460,6 +358,92 @@ public class SimulationModelMove : SimulationModel } } + private void Unloading(string data, UnLoadingState state) + { + string targetID = string.Empty; + + switch (state) + { + case UnLoadingState.store: + var store = JsonConvert.DeserializeObject(data); + targetID = store?.store_name ?? string.Empty; + break; + case UnLoadingState.queue: + var queue = JsonConvert.DeserializeObject(data); + targetID = queue?.output_queue ?? string.Empty; + break; + case UnLoadingState.defectStore: + var defectStore = JsonConvert.DeserializeObject(data); + targetID = defectStore?.store_name ?? string.Empty; + break; + case UnLoadingState.defectQueue: + var defectQueue = JsonConvert.DeserializeObject(data); + targetID = defectQueue?.output_queue ?? string.Empty; + break; + } + + if (string.IsNullOrEmpty(targetID)) + return; + + var model = DataManager.I.GetModel(targetID); + if (model == null) + { + return; + } + + var storeModel = model.GetComponent(); + + if (listProducts.Count > 0) + { + var product = listProducts[0]; + // storeModel?.StoreProduct(product); // 필요 시 활성화 + listProducts.RemoveAt(0); + Destroy(product); + } + else + { + Debug.LogWarning("Trying to unload from empty transporter : " + nodeID); + } + } + + private void Arrive(string data) + { + var arrived = JsonConvert.DeserializeObject(data); + if (arrived == null) + return; + + currentCount -= arrived.count; + SetBubble(currentCount); + } + + private void SpeedFactorApply(string data) + { + var speedData = JsonConvert.DeserializeObject(data); + if (speedData == null) + return; + + float originalTime = speedData.original; + float adjustedTime = speedData.adjusted; + arrivalTime += adjustedTime - originalTime; + elapsedTime = 0f; + originalPos = transform.position; + prevPos = transform.position; + } + + private void Returning(string data) + { + var ret = JsonConvert.DeserializeObject(data); + if (ret == null) + return; + + elapsedTime = 0f; + arrivalTime = ret.return_time; + originalPos = transform.position; + prevPos = transform.position; + if (origin != null) + destination = origin; + } + public override void SetBubble(object data) { string msg = $"{currentCount}/{totalMoved}"; diff --git a/Assets/Scripts/SimulationModels/SimulationModelProcess.cs b/Assets/Scripts/SimulationModels/SimulationModelProcess.cs index 16c05039..203d1f95 100644 --- a/Assets/Scripts/SimulationModels/SimulationModelProcess.cs +++ b/Assets/Scripts/SimulationModels/SimulationModelProcess.cs @@ -165,16 +165,19 @@ public class SimulationModelProcess : SimulationModel public string eventUsingStore = "processor_using_store"; public string eventStartBatch = "processor_batch_started"; public string eventOutputQueue = "processor_output_queue"; + + [Header("Transported Products")] public List listProducts = new List(); public Transform productPos; + + [Header("Process Events")] public UnityEvent onProcessStart; public UnityEvent onProcessEnd; + public SimulationModelResource resource; int productCount = 0; float processTime = 0; float elapsedTime = 0; - ConcurrentQueue dataQueue; - bool startBatch = false; Action AnimationAction_Start; Action AnimationAction_End; @@ -191,6 +194,27 @@ public class SimulationModelProcess : SimulationModel } } + private void LoadingCargo(ProcessDataClass_using_queue data) + { + string queueID = data.queue_name; + int loadCount = data.required_items; + SimulationModel model = DataManager.I.GetModel(queueID); + SimulationModelStore storeModel = model.GetComponent(); + for (int i = 0; i < loadCount; i++) + { + GameObject product = null; + product = ProductManager.Instance.SpawnProduct(); + product.GetComponent().SetParent(this.nodeID); + + product.transform.parent = productPos; + product.transform.localPosition = Vector3.zero; + product.transform.localRotation = Quaternion.identity; + listProducts.Add(product); + } + + return; + } + private void SetUsingQueue(ProcessDataClass_using_queue data) { string queueID = data.queue_name; @@ -208,8 +232,6 @@ public class SimulationModelProcess : SimulationModel product.transform.localRotation = Quaternion.identity; listProducts.Add(product); } - - return; } private void SetUsingStore(ProcessDataClass_using_store data) @@ -236,7 +258,6 @@ public class SimulationModelProcess : SimulationModel int productCount = data.product_count; processTime = data.processing_time; elapsedTime = 0; - startBatch = true; onProcessStart?.Invoke(); AnimationAction_Start?.Invoke(); } @@ -372,12 +393,9 @@ public class SimulationModelProcess : SimulationModel case "processor_resource_acquired": ResourceAcquired(message.data.ToObject()); - //Debug.Log($"{this.nodeID} acquired {message.data.ToObject().resource_name}"); return; case "processor_resource_released": - //Debug.Log($"{this.nodeID} release event"); - //Debug.Log($"{this.nodeID} release {this.resource.nodeID} "); ResourceReleased(); return; case "processor_statistics_update": diff --git a/Assets/Scripts/UI/UIDragSpawner.cs b/Assets/Scripts/UI/UIDragSpawner.cs index 9ec32c54..67dc52fc 100644 --- a/Assets/Scripts/UI/UIDragSpawner.cs +++ b/Assets/Scripts/UI/UIDragSpawner.cs @@ -8,11 +8,12 @@ public class UIDragSpawner : MonoBehaviour, IBeginDragHandler, IDragHandler, IEn public LayerMask mask; private GameObject dragPreview; public SimulationModel targetModel; + Transform objectRoot; //private CanvasGroup canvasGroup; void Awake() { - + objectRoot = ObjectRoot.I.transform; } public void SetInfo(SimulationModel spawnTarget, Sprite thumbnail) @@ -24,7 +25,8 @@ public class UIDragSpawner : MonoBehaviour, IBeginDragHandler, IDragHandler, IEn public void OnBeginDrag(PointerEventData eventData) { - dragPreview = Instantiate(targetModel).gameObject; + dragPreview = Instantiate(targetModel).gameObject; + dragPreview.transform.SetParent(objectRoot); } public void OnDrag(PointerEventData eventData) diff --git a/Assets/Scripts/Web/WebReceiver.cs b/Assets/Scripts/Web/WebReceiver.cs index deb38e4a..e7d0b404 100644 --- a/Assets/Scripts/Web/WebReceiver.cs +++ b/Assets/Scripts/Web/WebReceiver.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using UnityEngine; using System; +using System.Collections.Generic; namespace Octopus.Simulator.Networks @@ -13,6 +14,8 @@ namespace Octopus.Simulator.Networks public event Action onWebConfigReceived; public event Action onCameraReceived; public event Action onCompleteWindowReceived; + public event Action onLLMModelsReceived; + public event Action onLLMModelsUpdated; public void Start() @@ -21,9 +24,9 @@ namespace Octopus.Simulator.Networks onParameterRecived += FindAnyObjectByType().RequestInfo; onParameterRecived += FindAnyObjectByType().RequestInfo; #if UNITY_EDITOR - config.projectId = "37"; + config.projectId = "78"; //config.simulationId = "15"; - config.logicId = "42"; + config.logicId = "83"; WebParameters.config = config; onParameterRecived?.Invoke(); #else @@ -31,6 +34,19 @@ namespace Octopus.Simulator.Networks #endif } + private void Update() + { + if(Input.GetKeyDown(KeyCode.G)){ + var text=Resources.Load("simulation_model_infos_list"); + ReceiveLLMModels(text.text); + } + if (Input.GetKeyDown(KeyCode.F)) + { + var text = Resources.Load("simulation_model_infos_list_add"); + ReceiveLLMUpdate(text.text); + } + } + public void ReceiveWebParameterJson(string json) { config = JsonConvert.DeserializeObject(json); @@ -57,10 +73,37 @@ namespace Octopus.Simulator.Networks Debug.Log($"webCam:{json}"); } + public void ReceiveLLMModels(string json) + { + var data = JsonConvert.DeserializeObject(json); + onLLMModelsReceived?.Invoke(data.info); + } + + public void ReceiveLLMUpdate(string json) + { + var data = JsonConvert.DeserializeObject(json); + onLLMModelsUpdated?.Invoke(data.info); + } + public void ReceiveCompleteWindow() { onCompleteWindowReceived?.Invoke(); Debug.Log("CompleteReceive"); } + + public void SetKeyBoardOn() + { + WebGLInput.captureAllKeyboardInput = true; + } + + public void SetKeyBoardOff() + { + WebGLInput.captureAllKeyboardInput = false; + } + } + + public class LLMWraper + { + public string info; } } \ No newline at end of file diff --git a/Assets/Scripts/scene/SaveLoad/SaveLoadmanager.cs b/Assets/Scripts/scene/SaveLoad/SaveLoadmanager.cs index 076ef6e6..d9bf7419 100644 --- a/Assets/Scripts/scene/SaveLoad/SaveLoadmanager.cs +++ b/Assets/Scripts/scene/SaveLoad/SaveLoadmanager.cs @@ -1,110 +1,31 @@ -using SFB; -using UnityEngine; -using System.Collections.Generic; +using Best.HTTP.JSON.LitJson; using Newtonsoft.Json; +using RTG; +using SFB; +using System.Collections; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using UnityEngine; using UVC.Networks; -using RTG; namespace Octopus.Simulator.Networks { public class SaveLoadmanager : MonoBehaviour { - // Update is called once per frame - void Update() + ObjectRoot root; + + private void Awake() { - if (Input.GetKey(KeyCode.K)) - { - Onclick_Save_Local(); - } - - if (Input.GetKey(KeyCode.L)) - { - Onclick_Load_Local(); - } - + root = ObjectRoot.I; } - - public void Onclick_Save_Local() + private void Start() { - var path = StandaloneFileBrowser.SaveFilePanel("Save Layout", "", "", ""); - var simulationModels = FindObjectsByType(FindObjectsSortMode.None); - - List saveInfos = new List(); - - - foreach (var item in simulationModels) - { - var tmpSimulationModelInfo = new SimulationModelInfo(); - - //tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", ""); - tmpSimulationModelInfo.prefabName = item.prefabName; - tmpSimulationModelInfo.modelName = item.modelName; - //tmpSimulationModelInfo.modelType = item.modelType.ToString(); - tmpSimulationModelInfo.modelID = item.modelID; - tmpSimulationModelInfo.nodeID = item.nodeID; - tmpSimulationModelInfo.position = item.transform.position.ToString(); - tmpSimulationModelInfo.rotation = item.transform.rotation.ToString(); - tmpSimulationModelInfo.scale = item.transform.localScale.ToString(); - - saveInfos.Add(tmpSimulationModelInfo); - } - - string jsonObject = JsonConvert.SerializeObject(saveInfos, Formatting.Indented); - - FileStream fileStream = new FileStream(string.Format("{0}.json", path), FileMode.Create); - - byte[] buffer = Encoding.UTF8.GetBytes(jsonObject); - fileStream.Write(buffer, 0, buffer.Length); - fileStream.Close(); - + FindAnyObjectByType().onLLMModelsReceived += Onclick_Load; + FindAnyObjectByType().onLLMModelsUpdated += On_Update; } - - public void Onclick_Load_Local() - { - var path = StandaloneFileBrowser.OpenFilePanel("Open Layout", "", "", false); - - FileStream fileStream = new FileStream(string.Format("{0}", path), FileMode.Open); - byte[] data = new byte[fileStream.Length]; - fileStream.Read(data, 0, data.Length); - fileStream.Close(); - - string jsonData = Encoding.UTF8.GetString(data); - - List loadInfos = new List(); - - loadInfos = JsonConvert.DeserializeObject>(jsonData); - - - string resourcePath = "ModelsUpdated"; - - Dictionary loadModels = new Dictionary(); - - foreach (var item in loadInfos) - { - - var simulationModel = Resources.Load(string.Format("{0}/{1}", resourcePath, item.prefabName)); - var spawnItem = Instantiate(simulationModel).GetComponent(); - - spawnItem.modelName = item.modelName; - //spawnItem.modelType = item.modelType; - spawnItem.modelID = item.modelID; - spawnItem.nodeID = item.nodeID; - - spawnItem.gameObject.transform.position = ParseVector3(item.position); - spawnItem.gameObject.transform.localScale = ParseVector3(item.scale); - spawnItem.gameObject.transform.rotation = ParseQuaternion(item.rotation); - - if (!string.IsNullOrEmpty(item.nodeID)) - loadModels.Add(item.nodeID, spawnItem); - } - - LogicMappingDataBase.LoadDataBase(loadModels); - } - public void Onclick_Save() { //var path = StandaloneFileBrowser.SaveFilePanel("Save Layout", "", "", ""); @@ -195,6 +116,7 @@ namespace Octopus.Simulator.Networks public void Onclick_Load(string jsonData) { + root.ClearChildren(); List loadInfos = new List(); SaveLoadEntity loadEntity = new SaveLoadEntity(); @@ -205,18 +127,51 @@ namespace Octopus.Simulator.Networks } catch (JsonSerializationException e) { - Debug.Log("loadfromdb"); loadEntity = JsonConvert.DeserializeObject(jsonData); loadInfos = loadEntity.modelInfos; if (!FindAnyObjectByType().isLoad) { + Debug.Log(loadEntity.cameraPositionInfo.position); + Debug.Log(loadEntity.cameraPositionInfo.rotation); UnityEngine.Camera.main.transform.position = ParseVector3(loadEntity.cameraPositionInfo.position); UnityEngine.Camera.main.transform.eulerAngles = ParseVector3(loadEntity.cameraPositionInfo.rotation); } } - + StartCoroutine(LoadObject_Delay(loadInfos)); + //LoadObject(loadInfos); + } + + public void On_Update(string jsonData) + { + List loadInfos = new List(); + SaveLoadEntity loadEntity = new SaveLoadEntity(); + + // Ʈ ī޶ ϵ Ŀ catch try + try + { + loadInfos = JsonConvert.DeserializeObject>(jsonData); + } + catch (JsonSerializationException e) + { + loadEntity = JsonConvert.DeserializeObject(jsonData); + + loadInfos = loadEntity.modelInfos; + if (!FindAnyObjectByType().isLoad) + { + Debug.Log(loadEntity.cameraPositionInfo.position); + Debug.Log(loadEntity.cameraPositionInfo.rotation); + UnityEngine.Camera.main.transform.position = ParseVector3(loadEntity.cameraPositionInfo.position); + UnityEngine.Camera.main.transform.eulerAngles = ParseVector3(loadEntity.cameraPositionInfo.rotation); + } + } + + StartCoroutine(LoadObject_Delay(loadInfos)); + } + + public void LoadObject(List loadInfos) + { string resourcePath = "Library/LibraryPrefab"; Dictionary loadModels = new Dictionary(); @@ -228,11 +183,16 @@ namespace Octopus.Simulator.Networks { continue; } + if (DataManager.I.GetModel(item.nodeID)) + { + Debug.Log(DataManager.I.GetModel(item.nodeID)); + continue; + } var spawn = Instantiate(simulationModel); var spawnItem = spawn.GetComponent(); spawnItem.modelName = item.modelName; - spawnItem.objectName = item.objectName; + spawnItem.objectName = item.objectName; //spawnItem.modelType = item.modelType; spawnItem.modelID = item.modelID; spawnItem.nodeID = item.nodeID; @@ -241,6 +201,7 @@ namespace Octopus.Simulator.Networks spawnItem.gameObject.transform.localScale = ParseVector3(item.scale); spawnItem.gameObject.transform.rotation = ParseQuaternion(item.rotation); + spawn.transform.SetParent(root.transform); DataManager.I.AddModel(spawnItem); if (!string.IsNullOrEmpty(item.nodeID) && !loadModels.ContainsKey(item.nodeID)) @@ -250,6 +211,51 @@ namespace Octopus.Simulator.Networks LogicMappingDataBase.LoadDataBase(loadModels); } + public IEnumerator LoadObject_Delay(List loadInfos) + { + string resourcePath = "Library/LibraryPrefab"; + + Dictionary loadModels = new Dictionary(); + + foreach (var item in loadInfos) + { + var simulationModel = Resources.Load(string.Format("{0}/{1}", resourcePath, item.prefabName)); + if (!simulationModel) + { + continue; + } + if (DataManager.I.GetModel(item.nodeID)) + { + var existitem = DataManager.I.GetModel(item.nodeID).gameObject; + existitem.gameObject.transform.position = ParseVector3(item.position); + existitem.gameObject.transform.localScale = ParseVector3(item.scale); + existitem.gameObject.transform.rotation = ParseQuaternion(item.rotation); + continue; + } + var spawn = Instantiate(simulationModel); + var spawnItem = spawn.GetComponent(); + + spawnItem.modelName = item.modelName; + spawnItem.objectName = item.objectName; + //spawnItem.modelType = item.modelType; + spawnItem.modelID = item.modelID; + spawnItem.nodeID = item.nodeID; + + spawnItem.gameObject.transform.position = ParseVector3(item.position); + spawnItem.gameObject.transform.localScale = ParseVector3(item.scale); + spawnItem.gameObject.transform.rotation = ParseQuaternion(item.rotation); + + spawn.transform.SetParent(root.transform); + DataManager.I.AddModel(spawnItem); + + yield return new WaitForSeconds(0.2f); + if (!string.IsNullOrEmpty(item.nodeID) && !loadModels.ContainsKey(item.nodeID)) + loadModels.Add(item.nodeID, spawnItem); + } + + LogicMappingDataBase.LoadDataBase(loadModels); + } + //public void Onclick_Save() diff --git a/Assets/Settings/PC_Low.asset b/Assets/Settings/PC_Low.asset index 2f8e0b05..f93f45b6 100644 --- a/Assets/Settings/PC_Low.asset +++ b/Assets/Settings/PC_Low.asset @@ -19,7 +19,6 @@ MonoBehaviour: m_RendererDataList: - {fileID: 11400000, guid: 13ba41cd2fa191f43890b271bd110ed9, type: 2} - {fileID: 11400000, guid: a73f6fa069dd14a42b40cbb01bae63b4, type: 2} - - {fileID: 0} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 1 @@ -106,7 +105,7 @@ MonoBehaviour: m_PrefilteringModeAdditionalLightShadows: 2 m_PrefilterXRKeywords: 1 m_PrefilteringModeForwardPlus: 0 - m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeDeferredRendering: 2 m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 0260a4e9..cb985876 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 2193962912130007106 - - rid: 2193962912130007107 + - rid: 8234754981268291686 + - rid: 8234754981268291687 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 2193962912130007108 - - rid: 2193962912130007109 + - rid: 8234754981268291688 + - rid: 8234754981268291689 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 2193962912130007110 - - rid: 2193962912130007111 - - rid: 2193962912130007112 - - rid: 2193962912130007113 - - rid: 2193962912130007114 - - rid: 2193962912130007115 + - rid: 8234754981268291690 + - rid: 8234754981268291691 + - rid: 8234754981268291692 + - rid: 8234754981268291693 + - rid: 8234754981268291694 + - rid: 8234754981268291695 - rid: 6852985685364965392 - - rid: 2193962912130007116 + - rid: 8234754981268291696 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 2193962912130007117 + - rid: 8234754981268291697 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,114 +97,6 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 2193962912130007106 - type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_StripUnusedPostProcessingVariants: 1 - m_StripUnusedVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - - rid: 2193962912130007107 - type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} - m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} - m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} - m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 2193962912130007108 - type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} - m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} - m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} - m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} - m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} - m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} - m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} - m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 2193962912130007109 - type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} - m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 2193962912130007110 - type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} - data: - m_Version: 0 - m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3} - m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3} - m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3} - m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3} - m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3} - m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3} - m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} - m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} - m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 2193962912130007111 - type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} - m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} - m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 2193962912130007112 - type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} - subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} - voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} - traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} - traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} - skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} - skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} - renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 2193962912130007113 - type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 2193962912130007114 - type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} - numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 2193962912130007115 - type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_version: 0 - m_IncludeReferencedInScenes: 0 - m_IncludeAssetsByLabel: 0 - m_LabelToInclude: - - rid: 2193962912130007116 - type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} - probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} - probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 2193962912130007117 - type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - rid: 5092397466944798720 type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -264,6 +156,114 @@ MonoBehaviour: m_version: 0 m_EnableCompilationCaching: 1 m_EnableValidityChecks: 1 + - rid: 8234754981268291686 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 8234754981268291687 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 8234754981268291688 + type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + - rid: 8234754981268291689 + type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} + m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - rid: 8234754981268291690 + type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} + data: + m_Version: 0 + m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3} + m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3} + m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3} + m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3} + m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3} + m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3} + m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} + m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} + m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} + - rid: 8234754981268291691 + type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} + m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} + m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} + - rid: 8234754981268291692 + type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} + subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} + voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} + traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + - rid: 8234754981268291693 + type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 8234754981268291694 + type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} + numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} + - rid: 8234754981268291695 + type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_IncludeReferencedInScenes: 0 + m_IncludeAssetsByLabel: 0 + m_LabelToInclude: + - rid: 8234754981268291696 + type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} + probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} + probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} + - rid: 8234754981268291697 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - rid: 8712630790384254976 type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} data: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 3147ff5d..2ded7dcc 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -37,7 +37,7 @@ GraphicsSettings: m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: 4eb9ff6b5314098428cfa0be7e36ccda, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1