From 89364d9f0a79a43ce6e0ac0d097520deda12cf62 Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Mon, 7 Jul 2025 09:57:13 +0900 Subject: [PATCH] commit --- .../LibaryPrefab_Legacy}/Product_Box.jpg | Bin .../LibaryPrefab_Legacy}/Product_Box.jpg.meta | 0 .../LibaryPrefab_Legacy}/Product_Box.prefab | 0 .../Product_Box.prefab.meta | 0 .../LibaryPrefab_Legacy}/Product_Box_Dep.jpg | Bin .../Product_Box_Dep.jpg.meta | 0 .../Product_Box_Dep.prefab | 0 .../Product_Box_Dep.prefab.meta | 0 .../LibaryPrefab_Legacy/Queue_pallet.png | Bin 0 -> 9019 bytes .../LibaryPrefab_Legacy/Queue_pallet.png.meta | 130 +++++++++++++ Assets/Prefabs/UITopItem/Panel_Top.prefab | 51 +++-- .../LibraryPrefab/Process_Machine.prefab | 19 +- .../Library/LibraryPrefab/Queue_pallet.prefab | 176 ++++++++++++++++++ .../LibraryPrefab/Queue_pallet.prefab.meta | 7 + .../LibraryPrefab/Source_Pallet.prefab | 36 +--- .../LibraryPrefab/Store_Rack_NoCrane.prefab | 2 +- .../LibraryThumbnails/Queue_pallet.png | Bin 0 -> 32763 bytes .../LibraryThumbnails/Queue_pallet.png.meta | 130 +++++++++++++ Assets/Resources/MQTTConfig.json | 6 +- Assets/Resources/UI/InventoryItem.prefab | 2 +- Assets/Resources/WebConfig.json | 2 +- Assets/Scenes/Simulation_0.0.1.unity | 170 +++++++++++------ Assets/Scripts/ClickHandler.cs | 1 + Assets/Scripts/Manager/DataManager.cs | 25 ++- Assets/Scripts/RTGController.cs | 12 ++ ...niversalRenderPipelineGlobalSettings.asset | 60 +++--- .../LH/LogicData/LogicDataManager.cs | 27 ++- Assets/WorkSpace/LH/MQTTManager.cs | 2 +- Assets/WorkSpace/LH/Panel_SimulationUI.cs | 15 +- Assets/WorkSpace/LH/ProjectDataManager.cs | 14 +- .../LH/Simulation/SimulationModel.cs | 12 +- .../LH/Simulation/SimulationModelConveyor.cs | 2 +- .../LH/Simulation/SimulationModelSource.cs | 4 +- Assets/WorkSpace/LH/TestCode.cs | 19 -- Assets/WorkSpace/LH/TestCode.cs.meta | 2 - Assets/WorkSpace/LH/TransformToolbarScript.cs | 33 ++++ .../LH/TransformToolbarScript.cs.meta | 2 + Assets/WorkSpace/LH/Web/WebConfigLoader.cs | 8 +- Assets/WorkSpace/LH/Web/WebManager.cs | 5 + Assets/WorkSpace/LH/Web/WebReceiver.cs | 10 +- Assets/WorkSpace/LWJ/SaveLoadmanager.cs | 12 +- Assets/WorkSpace/LWJ/SimulationModelInfo.cs | 3 + ProjectSettings/ProjectSettings.asset | 6 +- 43 files changed, 804 insertions(+), 201 deletions(-) rename Assets/{Resources/Library/LibraryThumbnails => Prefabs/LibaryPrefab_Legacy}/Product_Box.jpg (100%) rename Assets/{Resources/Library/LibraryThumbnails => Prefabs/LibaryPrefab_Legacy}/Product_Box.jpg.meta (100%) rename Assets/{Resources/Library/LibraryPrefab => Prefabs/LibaryPrefab_Legacy}/Product_Box.prefab (100%) rename Assets/{Resources/Library/LibraryPrefab => Prefabs/LibaryPrefab_Legacy}/Product_Box.prefab.meta (100%) rename Assets/{Resources/Library/LibraryThumbnails => Prefabs/LibaryPrefab_Legacy}/Product_Box_Dep.jpg (100%) rename Assets/{Resources/Library/LibraryThumbnails => Prefabs/LibaryPrefab_Legacy}/Product_Box_Dep.jpg.meta (100%) rename Assets/{Resources/Library/LibraryPrefab => Prefabs/LibaryPrefab_Legacy}/Product_Box_Dep.prefab (100%) rename Assets/{Resources/Library/LibraryPrefab => Prefabs/LibaryPrefab_Legacy}/Product_Box_Dep.prefab.meta (100%) create mode 100644 Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png create mode 100644 Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png.meta create mode 100644 Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab create mode 100644 Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab.meta create mode 100644 Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png create mode 100644 Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png.meta delete mode 100644 Assets/WorkSpace/LH/TestCode.cs delete mode 100644 Assets/WorkSpace/LH/TestCode.cs.meta create mode 100644 Assets/WorkSpace/LH/TransformToolbarScript.cs create mode 100644 Assets/WorkSpace/LH/TransformToolbarScript.cs.meta diff --git a/Assets/Resources/Library/LibraryThumbnails/Product_Box.jpg b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.jpg similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Product_Box.jpg rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.jpg diff --git a/Assets/Resources/Library/LibraryThumbnails/Product_Box.jpg.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.jpg.meta similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Product_Box.jpg.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.jpg.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Product_Box.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Product_Box.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Product_Box.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Product_Box.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box.prefab.meta diff --git a/Assets/Resources/Library/LibraryThumbnails/Product_Box_Dep.jpg b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.jpg similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Product_Box_Dep.jpg rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.jpg diff --git a/Assets/Resources/Library/LibraryThumbnails/Product_Box_Dep.jpg.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.jpg.meta similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Product_Box_Dep.jpg.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.jpg.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Product_Box_Dep.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Product_Box_Dep.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Product_Box_Dep.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Product_Box_Dep.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Product_Box_Dep.prefab.meta diff --git a/Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png b/Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png new file mode 100644 index 0000000000000000000000000000000000000000..c85067b760359c395da7864caf0f62548de861d4 GIT binary patch literal 9019 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png.meta new file mode 100644 index 00000000..bd5f5d23 --- /dev/null +++ b/Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: d183ffb0b3b0cf5438f37bd020a73be7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UITopItem/Panel_Top.prefab b/Assets/Prefabs/UITopItem/Panel_Top.prefab index 9b09674d..290f1491 100644 --- a/Assets/Prefabs/UITopItem/Panel_Top.prefab +++ b/Assets/Prefabs/UITopItem/Panel_Top.prefab @@ -168,9 +168,9 @@ RectTransform: - {fileID: 5292512457043580520} m_Father: {fileID: 4984763691913443583} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 574, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -386, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2098207759045039967 @@ -185,8 +185,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1ea6a631f762ef04192456d9b727b870, type: 3} m_Name: m_EditorClassIdentifier: - playing: {fileID: 21300000, guid: 338405d6332a3db4b8d80383044bb882, type: 3} - pause: {fileID: 21300000, guid: f8465c3df32cf1941889a4455097d8c7, type: 3} + playing: {fileID: 21300000, guid: 7eeb96551b314474a9f71ba2aa86b0fe, type: 3} + pause: {fileID: 21300000, guid: 338405d6332a3db4b8d80383044bb882, type: 3} + isplaying: 0 --- !u!1 &1484343671791922000 GameObject: m_ObjectHideFlags: 0 @@ -594,9 +595,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4984763691913443583} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -895, y: -5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 65, y: -5} m_SizeDelta: {x: 53, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4943627641902797860 @@ -1144,9 +1145,9 @@ RectTransform: - {fileID: 2387822035400023919} m_Father: {fileID: 4984763691913443583} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -700, y: -6} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 260, y: -6} m_SizeDelta: {x: 280, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7323262126195169850 @@ -1768,7 +1769,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} propertyPath: m_AnchorMax.y @@ -1776,7 +1777,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} propertyPath: m_AnchorMin.y @@ -1820,7 +1821,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} propertyPath: m_AnchoredPosition.x - value: 341.1 + value: -618.9 objectReference: {fileID: 0} - target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} propertyPath: m_AnchoredPosition.y @@ -1898,10 +1899,30 @@ PrefabInstance: - {fileID: 5988394804144119520, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6058415533521999480, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 6570108898223279542} m_SourcePrefab: {fileID: 100100000, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} --- !u!224 &1425895631360000977 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} m_PrefabInstance: {fileID: 2551786316159780790} m_PrefabAsset: {fileID: 0} +--- !u!1 &8609216685609685454 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6058415533521999480, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3} + m_PrefabInstance: {fileID: 2551786316159780790} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6570108898223279542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8609216685609685454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4532cb1d47b03e243b7e5def77071685, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Library/LibraryPrefab/Process_Machine.prefab b/Assets/Resources/Library/LibraryPrefab/Process_Machine.prefab index 3748b4b2..21ae2cc2 100644 --- a/Assets/Resources/Library/LibraryPrefab/Process_Machine.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Process_Machine.prefab @@ -57,7 +57,7 @@ Transform: m_GameObject: {fileID: 8186549463259896341} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -2.27, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -111,8 +111,10 @@ MonoBehaviour: m_EditorClassIdentifier: modelName: Machine modelType: 4 + prefabName: modelID: nodeID: + eventKey: eventUsingQueue: processor_using_queue eventUsingStore: processor_using_store eventStartBatch: processor_batch_started @@ -149,6 +151,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + resource: {fileID: 0} --- !u!1001 &8546186986686672160 PrefabInstance: m_ObjectHideFlags: 0 @@ -197,12 +200,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7995712223807787156, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0e3f0b7dec0089c42899f516d86b22a0, type: 2} + - target: {fileID: -7688954262792016975, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0e3f0b7dec0089c42899f516d86b22a0, type: 2} - target: {fileID: 919132149155446097, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3} propertyPath: m_Name value: SM_Machine objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedComponents: + - {fileID: 4742473837712756890, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3} + m_RemovedGameObjects: + - {fileID: 5658468373451844476, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3} diff --git a/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab new file mode 100644 index 00000000..5f36e115 --- /dev/null +++ b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab @@ -0,0 +1,176 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2533144741472733039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3518951519622711998} + m_Layer: 0 + m_Name: ProductPosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3518951519622711998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2533144741472733039} + 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: 8919246687821753581} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2693674306982507605 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8919246687821753581} + - component: {fileID: 1166314466484888031} + m_Layer: 0 + m_Name: Queue_pallet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8919246687821753581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693674306982507605} + 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: + - {fileID: 8106578039535807440} + - {fileID: 3518951519622711998} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1166314466484888031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693674306982507605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d28be1f710820ac488733195726ded56, type: 3} + m_Name: + m_EditorClassIdentifier: + modelName: QPallet + modelType: 3 + modelID: + nodeID: + eventKey: + storePositions: + - {fileID: 3518951519622711998} + maxCapacity: 0 + storedProducts: [] + storeType: fifo + transporterPositions: [] +--- !u!1 &2884442297077190549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8106578039535807440} + - component: {fileID: 5933223697274662716} + - component: {fileID: 1315126460507660351} + m_Layer: 0 + m_Name: pallet.014 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8106578039535807440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2884442297077190549} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: -0.49999997, z: -0.5, w: -0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 30.000002, y: 30.000002, z: 30.000002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8919246687821753581} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5933223697274662716 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2884442297077190549} + m_Mesh: {fileID: 1747777963612955146, guid: 14931c3c24ab76e4ea8fbc2a5c5cf1a1, type: 3} +--- !u!23 &1315126460507660351 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2884442297077190549} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9b21d3f728af4854394ee4b667a96bab, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab.meta b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab.meta new file mode 100644 index 00000000..0e4b7f61 --- /dev/null +++ b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 07b091bc31bf61b43ba579a9c9baa7f0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab b/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab index a9d93e2c..eebe8dee 100644 --- a/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab @@ -1,37 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &6559360343920525660 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7374929338666446432} - m_Layer: 0 - m_Name: Models - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7374929338666446432 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6559360343920525660} - 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: - - {fileID: 6052881152895185930} - m_Father: {fileID: 6733763396490065076} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8981091474273742600 GameObject: m_ObjectHideFlags: 0 @@ -62,7 +30,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7374929338666446432} + - {fileID: 6052881152895185930} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3778496298057829303 @@ -98,7 +66,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7374929338666446432} + m_TransformParent: {fileID: 6733763396490065076} m_Modifications: - target: {fileID: 5825089394656910413, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3} propertyPath: m_Name diff --git a/Assets/Resources/Library/LibraryPrefab/Store_Rack_NoCrane.prefab b/Assets/Resources/Library/LibraryPrefab/Store_Rack_NoCrane.prefab index 01789a51..21b2082d 100644 --- a/Assets/Resources/Library/LibraryPrefab/Store_Rack_NoCrane.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Store_Rack_NoCrane.prefab @@ -384,7 +384,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: modelName: Rack(NoCrane) - modelType: 0 + modelType: 5 modelID: nodeID: eventKey: diff --git a/Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png b/Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe23f545f57b7bb13016c813d65145e51de2787 GIT binary patch literal 32763 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 AI{*Lx literal 0 HcmV?d00001 diff --git a/Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png.meta b/Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png.meta new file mode 100644 index 00000000..a604b8f4 --- /dev/null +++ b/Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 91769bc1ad6c7bb4396ae3e1ec63ed11 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/MQTTConfig.json b/Assets/Resources/MQTTConfig.json index 5655d6f6..2d8f9d05 100644 --- a/Assets/Resources/MQTTConfig.json +++ b/Assets/Resources/MQTTConfig.json @@ -2,8 +2,10 @@ "configs": [ { "name": "main", - "host": "220.90.135.42", - "port": 3016 + //"host": "220.90.135.42", + "host": "simulator.flexing.ai", + //"port": 3016, + "port": 8089 //"host": "localhost", //"port": 9001 } diff --git a/Assets/Resources/UI/InventoryItem.prefab b/Assets/Resources/UI/InventoryItem.prefab index a1f7ddad..d2e2205a 100644 --- a/Assets/Resources/UI/InventoryItem.prefab +++ b/Assets/Resources/UI/InventoryItem.prefab @@ -89,7 +89,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rectTransform: {fileID: 0} - prefabToSpawn: {fileID: 0} mask: serializedVersion: 2 m_Bits: 64 + targetModel: {fileID: 0} diff --git a/Assets/Resources/WebConfig.json b/Assets/Resources/WebConfig.json index a6d26928..c287c008 100644 --- a/Assets/Resources/WebConfig.json +++ b/Assets/Resources/WebConfig.json @@ -1,7 +1,7 @@ { "configs": [ { - "host": "http://220.90.135.42", + "host": "https://simulator.flexing.ai/server", //"port": 3000, "port": 3037, "accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcmlkIjoic3lzdGVtIiwibmFtZSI6IuyLnOyKpO2FnOq0gOumrOyekCIsImF1dGgiOiJzeXN0ZW0iLCJjb21wYW55SWQiOm51bGwsImlhdCI6MTczNTYwOTgyOCwiZXhwIjoxNzcxNjA5ODI4fQ.ApXLL_RsWWaa2KwRKrg1z8iT9MNYdZFqN-6Mn1Lvq8Q" diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index 3c6f3bed..e59fe718 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -3943,6 +3943,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 280530796} m_CullTransparentMesh: 1 +--- !u!114 &333326510 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + m_PrefabInstance: {fileID: 1978124149882810898} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &335469059 GameObject: m_ObjectHideFlags: 0 @@ -4176,8 +4187,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1900070398} m_HandleRect: {fileID: 1900070397} m_Direction: 0 - m_Value: -0.0000080781965 - m_Size: 0.9492538 + m_Value: 0 + m_Size: 0.94925374 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4688,23 +4699,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &654623204 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2069922514250663687, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - m_PrefabInstance: {fileID: 594906197750746389} - m_PrefabAsset: {fileID: 0} ---- !u!114 &654623208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654623204} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0b14edf47f496e743bbd0c912036fc12, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &801042363 GameObject: m_ObjectHideFlags: 0 @@ -5778,7 +5772,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -6043,9 +6037,9 @@ RectTransform: - {fileID: 2311924330207727106} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 478.4, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &367185471565543009 @@ -6092,6 +6086,10 @@ PrefabInstance: propertyPath: projectMenuButton value: objectReference: {fileID: 205755441} + - target: {fileID: 3408166986665272114, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} + propertyPath: projectSaveButton + value: + objectReference: {fileID: 333326510} - target: {fileID: 5366961481726599031, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} propertyPath: m_LocalPosition.x value: -1.2462957 @@ -6135,10 +6133,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2069922514250663687, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - insertIndex: -1 - addedObject: {fileID: 654623208} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} --- !u!224 &683822271461456720 RectTransform: @@ -6225,9 +6220,9 @@ RectTransform: - {fileID: 6499542618443802032} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 268.27, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &845759495562603487 @@ -6302,9 +6297,9 @@ RectTransform: - {fileID: 683822271461456720} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 96.3, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 133, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1139653803094619106 @@ -6462,9 +6457,9 @@ RectTransform: - {fileID: 4404546396223628744} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 548.5, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1373440720316733049 @@ -6624,14 +6619,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 22 - m_Right: 0 + m_Left: 44 + m_Right: 44 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 22 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 + m_ChildAlignment: 3 + m_Spacing: 44 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 @@ -6755,10 +6750,30 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2104988513} + - target: {fileID: 855212757162085532, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1484343671791922000, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_Name + value: projectSaveButton + objectReference: {fileID: 0} - target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1251266450} + - target: {fileID: 2387822035400023919, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_SizeDelta.y + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 2387822035400023919, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_AnchoredPosition.y + value: -34 + objectReference: {fileID: 0} + - target: {fileID: 3240717536119192961, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} - target: {fileID: 3913561980990034504, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -6855,6 +6870,10 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2104988513} + - target: {fileID: 7723225891300246667, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -7350,9 +7369,9 @@ RectTransform: - {fileID: 4009499115963812234} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 618.2, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3282056040016605463 @@ -7956,9 +7975,9 @@ RectTransform: m_Father: {fileID: 7027186561456478243} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -150, y: 0} + m_SizeDelta: {x: -360, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5268278286338153298 GameObject: @@ -7970,6 +7989,7 @@ GameObject: m_Component: - component: {fileID: 5239015192560940965} - component: {fileID: 7653034342743801325} + - component: {fileID: 7653034342743801326} m_Layer: 5 m_Name: ObjectLibraryTabs m_TagString: Untagged @@ -7993,9 +8013,9 @@ RectTransform: - {fileID: 4149779453014247578} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 408.2, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5427388964421026539 @@ -8426,7 +8446,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1792930014543576916} m_Direction: 2 m_Value: 0 - m_Size: 0.9999999 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -8650,7 +8670,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_AnchoredPosition.x - value: -1015.9637 + value: -1081.1 objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_AnchoredPosition.y @@ -9108,10 +9128,10 @@ RectTransform: - {fileID: 6023202728124299781} m_Father: {fileID: 1916153470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7062256588867111173 MonoBehaviour: @@ -9181,6 +9201,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 0 +--- !u!114 &7653034342743801326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268278286338153298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &7700752512093214595 GameObject: m_ObjectHideFlags: 0 @@ -9216,9 +9262,9 @@ RectTransform: - {fileID: 5905741446358991365} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 198.3, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7993663837510565849 @@ -9299,9 +9345,9 @@ RectTransform: - {fileID: 6137159009526871422} m_Father: {fileID: 5239015192560940965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 338.6, y: 120} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8236052657312982086 diff --git a/Assets/Scripts/ClickHandler.cs b/Assets/Scripts/ClickHandler.cs index a6207026..5a277b38 100644 --- a/Assets/Scripts/ClickHandler.cs +++ b/Assets/Scripts/ClickHandler.cs @@ -49,6 +49,7 @@ public class ClickHandler : MonoBehaviour Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); if (Physics.Raycast(ray, out RaycastHit hit)) { + Debug.Log(hit.transform.name); if (hit.collider.TryGetComponent(out var clickable)) { highLight.ShowHighlight((BoxCollider)hit.collider); diff --git a/Assets/Scripts/Manager/DataManager.cs b/Assets/Scripts/Manager/DataManager.cs index 19a115d6..efb426e9 100644 --- a/Assets/Scripts/Manager/DataManager.cs +++ b/Assets/Scripts/Manager/DataManager.cs @@ -13,17 +13,36 @@ public class DataManager : UnitySingleton public void AddModel(SimulationModel model) { if (models.Any(x => x == model)) - return; - int objCount = models.FindAll(x => x.modelName.Contains(model.modelName)).Count; - model.modelName = model.modelName + "_" + objCount.ToString(); + return; + string baseName = model.modelName; + if (string.IsNullOrEmpty(model.objectName)) + { + var existingIndices = models + .Where(x => x.objectName.StartsWith(baseName + "_")) + .Select(x => + { + var parts = x.objectName.Split('_'); + int idx; + return (parts.Length > 1 && int.TryParse(parts.Last(), out idx)) ? idx : 0; + }); + + int nextIndex = existingIndices.Any() ? existingIndices.Max() + 1 : 0; + + model.objectName = $"{baseName}_{nextIndex}"; + } + model.gameObject.name = model.objectName; model.onModelClicked += FindAnyObjectByType(FindObjectsInactive.Include).SetConnectedDataItem; models.Add(model); onModelsUpdated?.Invoke(models); } public void RemoveModel(SimulationModel model) { + Debug.Log("remove"); + /* if (models.Any(x => x == model)) return; + */ + Debug.Log("removeon"); models.Remove(model); onModelsUpdated?.Invoke(models); } diff --git a/Assets/Scripts/RTGController.cs b/Assets/Scripts/RTGController.cs index 3e8740e3..88e9fc29 100644 --- a/Assets/Scripts/RTGController.cs +++ b/Assets/Scripts/RTGController.cs @@ -1,6 +1,7 @@ using RTG; using System.Collections.Generic; using UnityEngine; +using Octopus.Simulator; public class RTGController : UnitySingleton { @@ -22,6 +23,8 @@ public class RTGController : UnitySingleton public List selectedObjects = new List(); public System.Action onTransformBegin; public System.Action> onTransformChanged; + + Panel_SimulationUI simulationUI; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { @@ -54,6 +57,15 @@ public class RTGController : UnitySingleton workGizmo = objectMoveGizmo; workGizmoId = GizmoId.None; + simulationUI = FindAnyObjectByType(); + } + + private void Update() + { + if (Input.GetKeyDown(KeyCode.Delete)&& !simulationUI.isplaying) + { + Destroy(selectedObjects[0]); + } } public void SetWorkGizmoId(GizmoId gizmoId) { diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 7b0f7641..24caff63 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 6289117031873904873 - - rid: 6289117031873904874 + - rid: 2193962276692426907 + - rid: 2193962276692426908 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 6289117031873904875 - - rid: 6289117031873904876 + - rid: 2193962276692426909 + - rid: 2193962276692426910 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 6289117031873904877 - - rid: 6289117031873904878 - - rid: 6289117031873904879 - - rid: 6289117031873904880 - - rid: 6289117031873904881 - - rid: 6289117031873904882 + - rid: 2193962276692426911 + - rid: 2193962276692426912 + - rid: 2193962276692426913 + - rid: 2193962276692426914 + - rid: 2193962276692426915 + - rid: 2193962276692426916 - rid: 6852985685364965392 - - rid: 6289117031873904883 + - rid: 2193962276692426917 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 6289117031873904884 + - rid: 2193962276692426918 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,20 +97,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 5092397466944798720 - type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} - m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} - m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} - - rid: 6289117031873904873 + - rid: 2193962276692426907 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: 6289117031873904874 + - rid: 2193962276692426908 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -122,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: 6289117031873904875 + - rid: 2193962276692426909 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -137,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: 6289117031873904876 + - rid: 2193962276692426910 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -146,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: 6289117031873904877 + - rid: 2193962276692426911 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -159,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: 6289117031873904878 + - rid: 2193962276692426912 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: 6289117031873904879 + - rid: 2193962276692426913 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -178,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: 6289117031873904880 + - rid: 2193962276692426914 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 6289117031873904881 + - rid: 2193962276692426915 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -193,24 +187,30 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 6289117031873904882 + - rid: 2193962276692426916 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 6289117031873904883 + - rid: 2193962276692426917 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: 6289117031873904884 + - rid: 2193962276692426918 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: + m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} + m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} + m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} - rid: 6852985685364965378 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs index 7d4a71d6..2af22eb3 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs @@ -17,10 +17,9 @@ namespace Octopus.Simulator public event Action onLogicUpdated; // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() + void Awake() { - FindAnyObjectByType().onParameterRecived += RequestInfo; - FindAnyObjectByType().onLogicUpdated += RequestInfo; + FindAnyObjectByType().onLogicUpdated += UpdateInfo; } public void RequestInfo() @@ -28,7 +27,13 @@ namespace Octopus.Simulator var requestURL = $"{WebManager.Instance.apiConfig.logic}/{WebParameters.config.logicId}"; WebManager.Instance.Reqeust(requestURL, RequestType.GET, GetDataFromInfo); + } + public void UpdateInfo() + { + var requestURL = $"{WebManager.Instance.apiConfig.logic}/{WebParameters.config.logicId}"; + + WebManager.Instance.Reqeust(requestURL, RequestType.GET, UpdateDataFromInfo); } void GetDataFromInfo(LogicData Data) @@ -48,5 +53,21 @@ namespace Octopus.Simulator } } } + + void UpdateDataFromInfo(LogicData Data) + { + onLogicUpdated?.Invoke(Data); + + currentData = Data; + config = Data.webConfig; + if (currentData.ModelFiles.Count >= 1) + { + SimulationModelFile files = currentData.ModelFiles[currentData.ModelFiles.Count - 1]; + if (files.id.HasValue) + { + WebParameters.config.modelId = files.id.Value.ToString(); + } + } + } } } \ No newline at end of file diff --git a/Assets/WorkSpace/LH/MQTTManager.cs b/Assets/WorkSpace/LH/MQTTManager.cs index 16f007ca..b2ac798b 100644 --- a/Assets/WorkSpace/LH/MQTTManager.cs +++ b/Assets/WorkSpace/LH/MQTTManager.cs @@ -83,7 +83,7 @@ namespace Octopus.Simulator.Networks public void Connect(string clientName, string host, int port) { client = new MQTTClientBuilder() - .WithOptions(new ConnectionOptionsBuilder().WithWebSocket(host,port).WithPath("/mqtt")) + .WithOptions(new ConnectionOptionsBuilder().WithWebSocket(host,port).WithPath("/mqtt").WithTLS()) .WithEventHandler(client => OnConnected(client, clientName)) .WithEventHandler(OnStateChange) .WithEventHandler(OnDisconnected) diff --git a/Assets/WorkSpace/LH/Panel_SimulationUI.cs b/Assets/WorkSpace/LH/Panel_SimulationUI.cs index 43076091..6c82bc66 100644 --- a/Assets/WorkSpace/LH/Panel_SimulationUI.cs +++ b/Assets/WorkSpace/LH/Panel_SimulationUI.cs @@ -21,7 +21,8 @@ namespace Octopus.Simulator int currentFastIndex = 4; public Sprite playing; public Sprite pause; - bool isplaying = false; + public bool isplaying = false; + public event Action onPlaying; public event Action onLogicBTNClicked; @@ -32,6 +33,7 @@ namespace Octopus.Simulator Button_Logic = transform.Find(nameof(Button_Logic)).GetComponent