From 65ca5c5f323b613a956e842fa8393ba0a2a411e9 Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Fri, 18 Jul 2025 14:42:37 +0900 Subject: [PATCH] 20250718_bugfix --- Assets/Prefabs/Canvas.prefab | 133 ++++- Assets/Prefabs/SimulatorLoadingPopup.prefab | 535 ++++++++++++++++++ .../Prefabs/SimulatorLoadingPopup.prefab.meta | 7 + Assets/Scenes/Simulation_0.0.1.unity | 111 ++-- ...niversalRenderPipelineGlobalSettings.asset | 48 +- Assets/WorkSpace/LH/LogicInfo.cs | 8 +- Assets/WorkSpace/LH/Panel_SimulationUI.cs | 21 +- Assets/WorkSpace/LH/Popup_SimulatorLoading.cs | 16 + .../LH/Popup_SimulatorLoading.cs.meta | 2 + .../LH/Simulation/SimulationModel.cs | 2 + .../LH/Simulation/SimulationModelConveyor.cs | 35 +- .../LH/Simulation/SimulationModelMove.cs | 55 +- .../LH/Simulation/SimulationModelSink.cs | 2 +- Assets/WorkSpace/LH/Web/WebManager.cs | 2 +- Assets/WorkSpace/LH/Web/WebReceiver.cs | 4 +- Assets/WorkSpace/LWJ/SaveLoadmanager.cs | 4 + 16 files changed, 838 insertions(+), 147 deletions(-) create mode 100644 Assets/Prefabs/SimulatorLoadingPopup.prefab create mode 100644 Assets/Prefabs/SimulatorLoadingPopup.prefab.meta create mode 100644 Assets/WorkSpace/LH/Popup_SimulatorLoading.cs create mode 100644 Assets/WorkSpace/LH/Popup_SimulatorLoading.cs.meta diff --git a/Assets/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab index 2c692247..5b4ad2e9 100644 --- a/Assets/Prefabs/Canvas.prefab +++ b/Assets/Prefabs/Canvas.prefab @@ -1328,7 +1328,7 @@ MonoBehaviour: m_HandleRect: {fileID: 6083826082979005142} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.45619336 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1479,8 +1479,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -15, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: -17.5, y: 0} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8812818880695905299 CanvasRenderer: @@ -1688,6 +1688,112 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4984763691913443583, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} m_PrefabInstance: {fileID: 3710661836462045643} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4221276343496085000 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 235861616779698476} + m_Modifications: + - target: {fileID: 2376785609007373004, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_text + value: "\uC2DC\uBBAC\uB808\uC774\uC158 \uACB0\uACFC \uBD88\uB7EC\uC624\uB294\uC911..." + objectReference: {fileID: 0} + - target: {fileID: 3392909442404011018, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_Name + value: SimulatorLoadingPopup + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} +--- !u!224 &7175238061759637248 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + m_PrefabInstance: {fileID: 4221276343496085000} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4630499734015177307 PrefabInstance: m_ObjectHideFlags: 0 @@ -2004,11 +2110,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 588411198089990919, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Size - value: 0.79725 + value: 0.5335 objectReference: {fileID: 0} - target: {fileID: 588411198089990919, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Value - value: 0.6999999 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1073750513953127727, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Type @@ -2152,11 +2258,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_AnchoredPosition.x - value: -1081.1 + value: -1202.75 objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_AnchoredPosition.y - value: 402.65002 + value: 651.5 objectReference: {fileID: 0} - target: {fileID: 4980370143534209375, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Color.a @@ -2212,7 +2318,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6940169657633229565, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Value - value: 0.65 + value: 0.26656395 objectReference: {fileID: 0} - target: {fileID: 7672464725508683099, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Colors.m_SelectedColor.b @@ -2452,6 +2558,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6276590003127642402, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} + propertyPath: m_Size + value: 0.39727804 + objectReference: {fileID: 0} - target: {fileID: 6505607372932287687, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2468,6 +2578,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6648348508146835120, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} + propertyPath: m_Size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6648348508146835120, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} propertyPath: m_Value value: 0 @@ -2686,6 +2800,9 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8654335745100445832, guid: ad46ffcb255049c42ac429bc5cf7308f, type: 3} + insertIndex: -1 + addedObject: {fileID: 7175238061759637248} - targetCorrespondingSourceObject: {fileID: 8199486109719142436, guid: ad46ffcb255049c42ac429bc5cf7308f, type: 3} insertIndex: -1 addedObject: {fileID: 7295755851252447351} diff --git a/Assets/Prefabs/SimulatorLoadingPopup.prefab b/Assets/Prefabs/SimulatorLoadingPopup.prefab new file mode 100644 index 00000000..cf04e8e6 --- /dev/null +++ b/Assets/Prefabs/SimulatorLoadingPopup.prefab @@ -0,0 +1,535 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &561245275509581667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5546689509580204049} + - component: {fileID: 6792030465261691400} + - component: {fileID: 5491531315415487793} + - component: {fileID: 2373407231095808413} + m_Layer: 5 + m_Name: loadingSpinner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5546689509580204049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561245275509581667} + 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: 2158263832114360155} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -200, y: 0} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6792030465261691400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561245275509581667} + m_CullTransparentMesh: 1 +--- !u!114 &5491531315415487793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561245275509581667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b37513bdac42a5a4faa7398b323e05da, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2373407231095808413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561245275509581667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 726bef883a42e7d4c9b8ab105beacf8e, type: 3} + m_Name: + m_EditorClassIdentifier: + Rotation: 1 + RotationSpeed: 1 + RotationAnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 2 + outSlope: 2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + Rainbow: 0 + RainbowSpeed: 0.5 + RainbowSaturation: 1 + RainbowAnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + RandomPeriod: 0 +--- !u!1 &1566362376916842284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3434448329916828317} + - component: {fileID: 935447348726474472} + - component: {fileID: 1325250647094651750} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3434448329916828317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566362376916842284} + 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: + - {fileID: 1962920681589526347} + m_Father: {fileID: 2158263832114360155} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &935447348726474472 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566362376916842284} + m_CullTransparentMesh: 1 +--- !u!114 &1325250647094651750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566362376916842284} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2662620375119099766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2158263832114360155} + - component: {fileID: 3741056992205385387} + - component: {fileID: 5746026345583809659} + - component: {fileID: 2673881409132951651} + m_Layer: 5 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2158263832114360155 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662620375119099766} + 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: + - {fileID: 3434448329916828317} + - {fileID: 5546689509580204049} + m_Father: {fileID: 6415216557765667080} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -175, y: -580} + m_SizeDelta: {x: 400, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3741056992205385387 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662620375119099766} + m_CullTransparentMesh: 1 +--- !u!114 &5746026345583809659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662620375119099766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2673881409132951651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2662620375119099766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71977ceb23b7b0141b5bb5a3f542f334, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3392909442404011018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6415216557765667080} + - component: {fileID: 8229491681532705057} + - component: {fileID: 8818477029428689131} + - component: {fileID: 1624655486532860052} + m_Layer: 5 + m_Name: SimulatorLoadingPopup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6415216557765667080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3392909442404011018} + 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: + - {fileID: 2158263832114360155} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8229491681532705057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3392909442404011018} + m_CullTransparentMesh: 1 +--- !u!114 &8818477029428689131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3392909442404011018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.2} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1624655486532860052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3392909442404011018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a5cb1f25f7d56b448d078d2a60bf309, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &4784947387547204330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1962920681589526347} + - component: {fileID: 9021848363454043403} + - component: {fileID: 2376785609007373004} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1962920681589526347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784947387547204330} + 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: 3434448329916828317} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9021848363454043403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784947387547204330} + m_CullTransparentMesh: 1 +--- !u!114 &2376785609007373004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784947387547204330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC2DC\uBBAC\uB808\uC774\uC158 \uC885\uB8CC" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4283124555 + m_fontColor: {r: 0.29411766, g: 0.29411766, b: 0.29411766, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 18, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prefabs/SimulatorLoadingPopup.prefab.meta b/Assets/Prefabs/SimulatorLoadingPopup.prefab.meta new file mode 100644 index 00000000..eb901ce7 --- /dev/null +++ b/Assets/Prefabs/SimulatorLoadingPopup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b6aadbff5c2ff504d86b4ba2b2253710 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index f6ecf1e6..1f86fc8c 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -3592,63 +3592,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a9d8c08cbd13f3419d22b5bafd16c28, type: 3} ---- !u!1001 &354815155 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalPosition.x - value: -28.072876 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalPosition.z - value: -50.87484 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2127442700830948185, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2516890092290491541, guid: edc366cf00c267c489519457d7cce823, type: 3} - propertyPath: m_Name - value: Store_BufferRack - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: edc366cf00c267c489519457d7cce823, type: 3} --- !u!108 &480699121 stripped Light: m_CorrespondingSourceObject: {fileID: 1377996960358852691, guid: 6d159c66df8395a40b6e819f4ef72a95, type: 3} @@ -4106,7 +4049,7 @@ MonoBehaviour: _settings: _canBeDisplayed: 1 _isExpanded: 1 - _isVisible: 0 + _isVisible: 1 _cellSizeX: 1 _cellSizeZ: 1 _yOffset: 0 @@ -4976,6 +4919,18 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1251266450} + - target: {fileID: 1478544554797267775, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1478544554797267775, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1550070951307592194, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1583162132624927149, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5020,6 +4975,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2783545212044606630, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3018469898925296895, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5048,6 +5007,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3312506907441204020, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3575434091452802806, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5238,11 +5201,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchoredPosition.x - value: -1081.1 + value: -797.25 objectReference: {fileID: 0} - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchoredPosition.y - value: 402.65002 + value: 175.5 objectReference: {fileID: 0} - target: {fileID: 5871922466397881520, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y @@ -5352,6 +5315,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7916537217148321212, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7916537217148321212, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7950674613912478590, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5368,6 +5339,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8217011211687897350, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8217011211687897350, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8825307241346239189, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5416,6 +5395,14 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9006850872049607365, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9006850872049607365, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_Value + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9084698983386852018, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5424,7 +5411,8 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2274164436698396267, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -5483,4 +5471,3 @@ SceneRoots: - {fileID: 941336964} - {fileID: 28956631} - {fileID: 18823863} - - {fileID: 354815155} diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index cebd5be8..c07597a0 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 2193962551779786968 - - rid: 2193962551779786969 + - rid: 2193962597229789299 + - rid: 2193962597229789300 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 2193962551779786970 - - rid: 2193962551779786971 + - rid: 2193962597229789301 + - rid: 2193962597229789302 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 2193962551779786972 - - rid: 2193962551779786973 - - rid: 2193962551779786974 - - rid: 2193962551779786975 - - rid: 2193962551779786976 - - rid: 2193962551779786977 + - rid: 2193962597229789303 + - rid: 2193962597229789304 + - rid: 2193962597229789305 + - rid: 2193962597229789306 + - rid: 2193962597229789307 + - rid: 2193962597229789308 - rid: 6852985685364965392 - - rid: 2193962551779786978 + - rid: 2193962597229789309 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 2193962551779786979 + - rid: 2193962597229789310 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 2193962551779786968 + - rid: 2193962597229789299 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: 2193962551779786969 + - rid: 2193962597229789300 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -116,7 +116,7 @@ MonoBehaviour: 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: 2193962551779786970 + - rid: 2193962597229789301 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -131,7 +131,7 @@ MonoBehaviour: 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: 2193962551779786971 + - rid: 2193962597229789302 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -140,7 +140,7 @@ MonoBehaviour: 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: 2193962551779786972 + - rid: 2193962597229789303 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -153,13 +153,13 @@ MonoBehaviour: 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: 2193962551779786973 + - rid: 2193962597229789304 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: 2193962551779786974 + - rid: 2193962597229789305 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -172,12 +172,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 2193962551779786975 + - rid: 2193962597229789306 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 2193962551779786976 + - rid: 2193962597229789307 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,21 +187,21 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 2193962551779786977 + - rid: 2193962597229789308 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 2193962551779786978 + - rid: 2193962597229789309 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: 2193962551779786979 + - rid: 2193962597229789310 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} diff --git a/Assets/WorkSpace/LH/LogicInfo.cs b/Assets/WorkSpace/LH/LogicInfo.cs index ed0a7c50..b869972c 100644 --- a/Assets/WorkSpace/LH/LogicInfo.cs +++ b/Assets/WorkSpace/LH/LogicInfo.cs @@ -143,7 +143,7 @@ namespace Octopus.Simulator { public string? name = ""; public string? label; - public int capacity = 0; + public Int64 capacity = 0; //public int quantity; public int priority_order; public string? queue_type; @@ -156,7 +156,7 @@ namespace Octopus.Simulator public class LogicResource : ILogicItem { public string? name = ""; - public int capacity = 0; + public Int64 capacity = 0; public string? label; public int? repair_time = 0; public double speed_factor = 0.0; @@ -171,7 +171,7 @@ namespace Octopus.Simulator { public string? name; public string? label; - public int capacity; + public Int64 capacity; //public int quantity; public int priority_order; public string? Name => name; @@ -495,7 +495,7 @@ namespace Octopus.Simulator } catch(Exception e) { - AlertManager.I.ShowAlert("Error", e.Message).Forget(); + AlertManager.I.ShowConfirm("Error", e.Message).Forget(); } list.Add(comp); } diff --git a/Assets/WorkSpace/LH/Panel_SimulationUI.cs b/Assets/WorkSpace/LH/Panel_SimulationUI.cs index 05e8435d..edf9f1ff 100644 --- a/Assets/WorkSpace/LH/Panel_SimulationUI.cs +++ b/Assets/WorkSpace/LH/Panel_SimulationUI.cs @@ -160,7 +160,8 @@ namespace Octopus.Simulator void Request_SimulationComplete() { var requestURL = $"{webmanager.apiConfig.history}/{WebParameters.id}/pause"; - + onComplete(); + FindAnyObjectByType(FindObjectsInactive.Include).gameObject.SetActive(true); webmanager.Reqeust(requestURL, RequestType.POST, PauseCallback); //webmanager.Request_Post(null, requestURL, (flag, value) => @@ -192,10 +193,20 @@ namespace Octopus.Simulator { Button_FastForward.interactable = !flag; Button_Reset.interactable = true; + Button_Complete.interactable = true; + } + + void onComplete() + { + Button_Play.interactable = false; + Button_FastForward.interactable = false; + Button_Complete.interactable = false; + Button_Reset.interactable = true; } public void PauseCallback(UpdatedSimulationsInfo response) { + isplaying = false; var requsetURL = $"{webmanager.apiConfig.history}/{WebParameters.id}/toggle-realtime"; RealTime rt = new RealTime(); rt.realTime = false; @@ -206,11 +217,13 @@ namespace Octopus.Simulator { var reqeustURL = $"{webmanager.apiConfig.history}/{WebParameters.id}/resume"; emptyClass ec = new emptyClass(); - webmanager.Reqeust(reqeustURL, RequestType.POST, null, ec); - + webmanager.Reqeust(reqeustURL, RequestType.POST, (value)=>ResumeCallBack(), ec); } - + void ResumeCallBack() + { + FindAnyObjectByType(FindObjectsInactive.Include).gameObject.SetActive(false); + } //MQTT 재연결 private void ReConnect(MQTTClient client) diff --git a/Assets/WorkSpace/LH/Popup_SimulatorLoading.cs b/Assets/WorkSpace/LH/Popup_SimulatorLoading.cs new file mode 100644 index 00000000..f68d168b --- /dev/null +++ b/Assets/WorkSpace/LH/Popup_SimulatorLoading.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class Popup_SimulatorLoading : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/WorkSpace/LH/Popup_SimulatorLoading.cs.meta b/Assets/WorkSpace/LH/Popup_SimulatorLoading.cs.meta new file mode 100644 index 00000000..2bfd4e02 --- /dev/null +++ b/Assets/WorkSpace/LH/Popup_SimulatorLoading.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2a5cb1f25f7d56b448d078d2a60bf309 \ No newline at end of file diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModel.cs b/Assets/WorkSpace/LH/Simulation/SimulationModel.cs index 80bf1988..7cf08691 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModel.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModel.cs @@ -31,6 +31,7 @@ public abstract class SimulationModel : MonoBehaviour, IClickable public string eventKey; private bool isQuitting = false; public Action onModelClicked; + protected Panel_SimulationUI simulationUI; void Awake() { init(); @@ -49,6 +50,7 @@ public abstract class SimulationModel : MonoBehaviour, IClickable FitCollider(); bubbleUIPrefab = Resources.Load("BubbleUI"); DataBubbleSocket = transform.Find("BubbleSocket"); + simulationUI = FindAnyObjectByType(); if (!DataBubbleSocket) { DataBubbleSocket = this.transform; diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs b/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs index a54ca426..55a99cf1 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs @@ -6,6 +6,8 @@ using System.Collections; using Newtonsoft.Json.Linq; using System.Collections.Concurrent; using Octopus.Simulator.Networks; +using Octopus.Simulator; +using static UnityEngine.InputSystem.HID.HID; #pragma warning disable CS8632 public class SimulationModelConveyor : SimulationModel @@ -31,23 +33,26 @@ public class SimulationModelConveyor : SimulationModel // Update is called once per frame void Update() { - if (moveTargetCargo != null) + if (simulationUI.isplaying) { - startPosition = this.transform.Find(nameof(startPosition)).transform.position; - endPosition = this.transform.Find(nameof(endPosition)).transform.position; - - elapseTime += Time.deltaTime; - - if (elapseTime < transportTime) + if (moveTargetCargo != null) { - moveTargetCargo.transform.position = Vector3.Lerp(startPosition, endPosition, elapseTime / transportTime); - } - else if (elapseTime > transportTime) - { - //moveTargetCargo = null; - elapseTime = 0; - } + startPosition = this.transform.Find(nameof(startPosition)).transform.position; + endPosition = this.transform.Find(nameof(endPosition)).transform.position; + elapseTime += Time.deltaTime; + + if (elapseTime < transportTime) + { + moveTargetCargo.transform.position = Vector3.Lerp(startPosition, endPosition, elapseTime / transportTime); + } + else if (elapseTime > transportTime) + { + //moveTargetCargo = null; + elapseTime = 0; + } + + } } } @@ -290,7 +295,7 @@ public class SimulationModelConveyor : SimulationModel // 생성 currentBubble = Instantiate(bubbleUIPrefab, FindAnyObjectByType().transform); currentBubble.target = DataBubbleSocket; - currentBubble.worldOffset = new Vector3(0, 2.0f, 0); // 필요에 따라 조절 + currentBubble.worldOffset = new Vector3(0, 1.0f, 0); // 필요에 따라 조절 } // 텍스트 갱신 currentBubble.SetMessage(msg); diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs b/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs index 11b33fd5..e9fdd900 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs @@ -167,37 +167,40 @@ public class SimulationModelMove : SimulationModel void Update() { - int interval = 0; - if (productCount != listProducts.Count) + if (simulationUI.isplaying) { - productCount = listProducts.Count; - for (int i = 0; i < productCount; i++) + int interval = 0; + if (productCount != listProducts.Count) { - GameObject gb = listProducts[i]; - gb.transform.localPosition = productDistance; - interval++; + productCount = listProducts.Count; + for (int i = 0; i < productCount; i++) + { + GameObject gb = listProducts[i]; + gb.transform.localPosition = productDistance; + interval++; + } } - } - if (destination != null) - { - elapsedTime += Time.deltaTime * WebParameters.speed; + if (destination != null) + { + elapsedTime += Time.deltaTime * WebParameters.speed; - if (elapsedTime / arrivalTime > 1.0f) - { - transform.position = destination.position; - transform.forward = destination.forward; - destination = null; - } - else - { - transform.position = Vector3.Lerp(originalPos, destination.position, elapsedTime / arrivalTime); - Vector3 dir = transform.position - prevPos; - dir.y = 0; - dir.Normalize(); - transform.forward = dir; - prevPos = transform.position; - } + if (elapsedTime / arrivalTime > 1.0f) + { + transform.position = destination.position; + transform.forward = destination.forward; + destination = null; + } + else + { + transform.position = Vector3.Lerp(originalPos, destination.position, elapsedTime / arrivalTime); + Vector3 dir = transform.position - prevPos; + dir.y = 0; + dir.Normalize(); + transform.forward = dir; + prevPos = transform.position; + } + } } } /* diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModelSink.cs b/Assets/WorkSpace/LH/Simulation/SimulationModelSink.cs index 17c1a82c..026e642e 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModelSink.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModelSink.cs @@ -199,7 +199,7 @@ public class SimulationModelSink : SimulationModel // currentBubble = Instantiate(bubbleUIPrefab, FindAnyObjectByType().transform); currentBubble.target = DataBubbleSocket; - currentBubble.worldOffset = new Vector3(0, 2.0f, 0); // ʿ信 + currentBubble.worldOffset = new Vector3(0, 0, 0); // ʿ信 } // ؽƮ currentBubble.SetMessage(msg); diff --git a/Assets/WorkSpace/LH/Web/WebManager.cs b/Assets/WorkSpace/LH/Web/WebManager.cs index d232d98f..4d043c65 100644 --- a/Assets/WorkSpace/LH/Web/WebManager.cs +++ b/Assets/WorkSpace/LH/Web/WebManager.cs @@ -92,7 +92,7 @@ namespace UVC.Networks } catch (Exception e) { - AlertManager.I.ShowAlert("Error",e.Message).Forget(); + AlertManager.I.ShowConfirm("Error",e.Message).Forget(); } } diff --git a/Assets/WorkSpace/LH/Web/WebReceiver.cs b/Assets/WorkSpace/LH/Web/WebReceiver.cs index bc218491..cd329519 100644 --- a/Assets/WorkSpace/LH/Web/WebReceiver.cs +++ b/Assets/WorkSpace/LH/Web/WebReceiver.cs @@ -20,9 +20,9 @@ namespace Octopus.Simulator.Networks onParameterRecived += FindAnyObjectByType().RequestInfo; onParameterRecived += FindAnyObjectByType().RequestInfo; #if UNITY_EDITOR - config.projectId = "45"; + config.projectId = "53"; //config.simulationId = "15"; - config.logicId = "50"; + config.logicId = "58"; WebParameters.config = config; onParameterRecived?.Invoke(); #else diff --git a/Assets/WorkSpace/LWJ/SaveLoadmanager.cs b/Assets/WorkSpace/LWJ/SaveLoadmanager.cs index 28b78a06..a7d4abf9 100644 --- a/Assets/WorkSpace/LWJ/SaveLoadmanager.cs +++ b/Assets/WorkSpace/LWJ/SaveLoadmanager.cs @@ -198,6 +198,10 @@ namespace Octopus.Simulator.Networks foreach (var item in loadInfos) { var simulationModel = Resources.Load(string.Format("{0}/{1}", resourcePath, item.prefabName)); + if (!simulationModel) + { + continue; + } var spawn = Instantiate(simulationModel); var spawnItem = spawn.GetComponent();