diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Move_Conv.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_Conv.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Move_Conv.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_Conv.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Move_Conv.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_Conv.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Move_Conv.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_Conv.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Move_ForkLift.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_ForkLift.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Move_ForkLift.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_ForkLift.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Move_ForkLift.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_ForkLift.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Move_ForkLift.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Move_ForkLift.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Process_Machine.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Process_Machine.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Process_Machine.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Process_Machine.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Process_Machine.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Process_Machine.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Process_Machine.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Process_Machine.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Queue_pallet.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Queue_pallet.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Queue_pallet.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Queue_pallet.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Queue_pallet.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Queue_pallet.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Queue_pallet.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Queue_pallet.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Sink_Contaiiner.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Sink_Contaiiner.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Sink_Contaiiner.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Sink_Contaiiner.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Sink_Contaiiner.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Sink_Contaiiner.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Sink_Contaiiner.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Sink_Contaiiner.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Source_Pallet.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Source_Pallet.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Source_Pallet.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Source_Pallet.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Store_BufferRack.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_BufferRack.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Store_BufferRack.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_BufferRack.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Store_BufferRack.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_BufferRack.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Store_BufferRack.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_BufferRack.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Store_Rack_NoCrane.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_Rack_NoCrane.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Store_Rack_NoCrane.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_Rack_NoCrane.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/Store_Rack_NoCrane.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_Rack_NoCrane.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/Store_Rack_NoCrane.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Store_Rack_NoCrane.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/box.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/box.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/box.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/box.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Re_Size/box.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/box.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Re_Size/box.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/box.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Move_Conv 1.prefab b/Assets/Resources/Library/LibraryPrefab/Move_Conv.prefab similarity index 99% rename from Assets/Resources/Library/LibraryPrefab/Move_Conv 1.prefab rename to Assets/Resources/Library/LibraryPrefab/Move_Conv.prefab index 2d51087a..c3376462 100644 --- a/Assets/Resources/Library/LibraryPrefab/Move_Conv 1.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Move_Conv.prefab @@ -42,7 +42,7 @@ GameObject: - component: {fileID: 8779729493819298720} - component: {fileID: 1684325270577303200} m_Layer: 0 - m_Name: Move_Conv 1 + m_Name: Move_Conv m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Library/LibraryPrefab/Move_Conv 1.prefab.meta b/Assets/Resources/Library/LibraryPrefab/Move_Conv.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Move_Conv 1.prefab.meta rename to Assets/Resources/Library/LibraryPrefab/Move_Conv.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Queue_pallet 1.prefab b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab similarity index 99% rename from Assets/Resources/Library/LibraryPrefab/Queue_pallet 1.prefab rename to Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab index 2aa81396..26f81b14 100644 --- a/Assets/Resources/Library/LibraryPrefab/Queue_pallet 1.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab @@ -150,7 +150,7 @@ GameObject: - component: {fileID: 6444474430373671530} - component: {fileID: 3859089608024316321} m_Layer: 0 - m_Name: Queue_pallet 1 + m_Name: Queue_pallet m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Library/LibraryPrefab/Queue_pallet 1.prefab.meta b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Queue_pallet 1.prefab.meta rename to Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab b/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab index ff083e7d..fcf3e6b0 100644 --- a/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab @@ -89,8 +89,8 @@ MonoBehaviour: eventGenerateDefect: product_defective eventQueueProduct: product_queued eventStoreProduct: product_stored - productPrefab: {fileID: 3554305899873773484, guid: a0607d71a04b3f4459be2d9646fcb429, type: 3} - defectPrefab: {fileID: 3554305899873773484, guid: a0607d71a04b3f4459be2d9646fcb429, type: 3} + productPrefab: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + defectPrefab: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} listProducts: [] listDefects: [] productPos: {fileID: 6052881152895185930} diff --git a/Assets/Resources/ModelsUpdated/Box.prefab b/Assets/Resources/ModelsUpdated/Box.prefab new file mode 100644 index 00000000..4e5d2f95 --- /dev/null +++ b/Assets/Resources/ModelsUpdated/Box.prefab @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5493621585195015779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5335286759056395311} + - component: {fileID: 1648424191440187688} + m_Layer: 0 + m_Name: Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5335286759056395311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5493621585195015779} + 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: 1107537069894811736} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1648424191440187688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5493621585195015779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36cf0b4a042344b4f922e7d6848b38dd, type: 3} + m_Name: + m_EditorClassIdentifier: + modelName: Box_Pallet + objectName: + modelType: 0 + prefabName: + modelID: + nodeID: + DataBubbleSocket: {fileID: 0} + eventKey: +--- !u!1001 &7675114256776407405 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5335286759056395311} + m_Modifications: + - target: {fileID: 1139541977230152114, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_Name + value: box + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} +--- !u!4 &1107537069894811736 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7340226207131756853, guid: ca700a4d9d1e90f41abf4b9b6c0b0279, type: 3} + m_PrefabInstance: {fileID: 7675114256776407405} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/ModelsUpdated/Box.prefab.meta b/Assets/Resources/ModelsUpdated/Box.prefab.meta new file mode 100644 index 00000000..09340d0a --- /dev/null +++ b/Assets/Resources/ModelsUpdated/Box.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 866edb2078170754bb8512b75daa8930 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index b005450d..3e59a187 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -4567,6 +4567,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 351461855981719754, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} + propertyPath: product + value: + objectReference: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} - target: {fileID: 2069922514250663687, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} propertyPath: m_Name value: Manager @@ -4903,6 +4907,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 766876955048890188, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 766876955048890188, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1022219459909171022, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5183,6 +5195,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 402.65002 objectReference: {fileID: 0} + - target: {fileID: 5871922466397881520, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5871922466397881520, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6070406138535321880, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5227,6 +5247,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6946246336637483485, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6946246336637483485, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6946246336637483485, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6946246336637483485, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6952542729998343942, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6952542729998343942, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6966809508302130714, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5307,6 +5351,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8956576480089236287, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8956576480089236287, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8956576480089236287, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8956576480089236287, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9084698983386852018, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9084698983386852018, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/WorkSpace/LH/Manager.prefab b/Assets/WorkSpace/LH/Manager.prefab index 16e071ec..c1ea9048 100644 --- a/Assets/WorkSpace/LH/Manager.prefab +++ b/Assets/WorkSpace/LH/Manager.prefab @@ -275,7 +275,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9846aa51eb7528b429862cfda7772b02, type: 3} m_Name: m_EditorClassIdentifier: - product: {fileID: 3554305899873773484, guid: a0607d71a04b3f4459be2d9646fcb429, type: 3} + product: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} --- !u!1 &8662603362806828459 GameObject: m_ObjectHideFlags: 0