diff --git a/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab index a50236da..1eb733a7 100644 --- a/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab +++ b/Assets/Prefabs/LibaryPrefab_Legacy/Re_Size/Source_Pallet.prefab @@ -51,6 +51,7 @@ MonoBehaviour: prefabName: modelID: nodeID: + DataBubbleSocket: {fileID: 0} eventKey: eventGenerateProduct: product_generated eventGenerateDefect: product_defective diff --git a/Assets/Prefabs/LibaryPrefab_Legacy/Source_Pallet.png b/Assets/Prefabs/LibaryPrefab_Legacy/Source_Pallet.png new file mode 100644 index 00000000..c85067b7 Binary files /dev/null and b/Assets/Prefabs/LibaryPrefab_Legacy/Source_Pallet.png differ diff --git a/Assets/Prefabs/LibaryPrefab_Legacy/Source_Pallet.png.meta b/Assets/Prefabs/LibaryPrefab_Legacy/Source_Pallet.png.meta new file mode 100644 index 00000000..9cf69bd8 --- /dev/null +++ b/Assets/Prefabs/LibaryPrefab_Legacy/Source_Pallet.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 37883183d142a48449362d8c9249ae05 +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/Resources/Library/LibraryThumbnails/Move_AMR.png b/Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.png similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Move_AMR.png rename to Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.png diff --git a/Assets/Resources/Library/LibraryThumbnails/Move_AMR.png.meta b/Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.png.meta similarity index 100% rename from Assets/Resources/Library/LibraryThumbnails/Move_AMR.png.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.png.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Move_AMR.prefab b/Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.prefab similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Move_AMR.prefab rename to Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.prefab diff --git a/Assets/Resources/Library/LibraryPrefab/Move_AMR.prefab.meta b/Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.prefab.meta similarity index 100% rename from Assets/Resources/Library/LibraryPrefab/Move_AMR.prefab.meta rename to Assets/Prefabs/LibaryPrefab_Legacy/UnUse/Move_AMR.prefab.meta diff --git a/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab b/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab index d202c1dc..a8087844 100644 --- a/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Source_Pallet.prefab @@ -64,6 +64,14 @@ Transform: - {fileID: 5599208857172225641} - {fileID: 3960822197541364841} - {fileID: 905065942312218413} + - {fileID: 5679584809569021155} + - {fileID: 3302499291690078691} + - {fileID: 2071668615001234010} + - {fileID: 5877615856259472999} + - {fileID: 5981091800794657976} + - {fileID: 2983306076210867874} + - {fileID: 8940062652725662137} + - {fileID: 3885132390490803974} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3111121208981700778 @@ -127,6 +135,68 @@ Transform: m_Children: [] m_Father: {fileID: 6294758267482251498} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &349960535945912524 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 0.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: -0.55 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &5679584809569021155 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 349960535945912524} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1596928041024710814 PrefabInstance: m_ObjectHideFlags: 0 @@ -219,3 +289,437 @@ Transform: m_CorrespondingSourceObject: {fileID: 6601449523113608951, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3} m_PrefabInstance: {fileID: 1596928041024710814} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1804716702877563031 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 1.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: -0.55 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &5981091800794657976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 1804716702877563031} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1989398549555204680 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 0.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: 0.44699997 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &5877615856259472999 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 1989398549555204680} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3898926057605422486 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 1.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: 0.44699997 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &8940062652725662137 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 3898926057605422486} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6254009679645480565 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 0.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: 0.447 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &2071668615001234010 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 6254009679645480565} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7164217774669488781 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 1.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: -0.55 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &2983306076210867874 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 7164217774669488781} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7484536805770681804 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 0.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: -0.55 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &3302499291690078691 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 7484536805770681804} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9214501559712826153 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6294758267482251498} + m_Modifications: + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.y + value: 1.85 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalPosition.z + value: 0.447 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5493621585195015779, guid: 866edb2078170754bb8512b75daa8930, type: 3} + propertyPath: m_Name + value: Box (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 866edb2078170754bb8512b75daa8930, type: 3} +--- !u!4 &3885132390490803974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335286759056395311, guid: 866edb2078170754bb8512b75daa8930, type: 3} + m_PrefabInstance: {fileID: 9214501559712826153} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png b/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png index c85067b7..6c91132c 100644 Binary files a/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png and b/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png differ diff --git a/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png.meta b/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png.meta index 9cf69bd8..044148d7 100644 --- a/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png.meta +++ b/Assets/Resources/Library/LibraryThumbnails/Source_Pallet.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37883183d142a48449362d8c9249ae05 +guid: b8d71d84da2fa1d4bb3c79a1ca096d3c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 00000000..ab21f4d6 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1 @@ +{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"WebGL","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.34f1","Branch":"6000.0/staging","Changeset":"5ab2d9ed9190","Date":1736176501},"Dependencies":["com.unity.2d.sprite@1.0.0","com.unity.ide.visualstudio@2.0.22","com.unity.inputsystem@1.11.2","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.render-pipelines.universal@17.0.3","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.tivadar.best.http@3.0.15","com.tivadar.best.mqtt@3.0.4","com.tivadar.best.stomp@1.0.2","com.tivadar.best.websockets@3.0.7","com.unity.burst@1.8.19","com.unity.profiling.core@1.0.2","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.0.3","com.unity.shadergraph@17.0.3","com.unity.render-pipelines.universal-config@17.0.3","com.unity.test-framework@1.4.5","com.unity.mathematics@1.3.2","com.unity.searcher@4.9.2","com.unity.collections@2.5.1","com.unity.rendering.light-transport@1.0.1","com.unity.ext.nunit@2.0.5","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 00000000..e939216c --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e7eb88fd4e4508b418ff26b427510a7f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json new file mode 100644 index 00000000..49438ae1 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json @@ -0,0 +1 @@ +{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta new file mode 100644 index 00000000..f7e3912d --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff09573ebff24c041835d562810821fb +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/WebConfig.json b/Assets/Resources/WebConfig.json index 5a5b72cd..51971a11 100644 --- a/Assets/Resources/WebConfig.json +++ b/Assets/Resources/WebConfig.json @@ -1,8 +1,8 @@ { "configs": [ { - //"host": "https://simulator.flexing.ai/server", - "host": "http://220.90.135.122", + "host": "https://simulator.flexing.ai/server", + //"host": "http://220.90.135.122", //"port": 3000, //"port": 3037, "port": 3030, diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs b/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs index 66d3a8f9..a54ca426 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs @@ -44,7 +44,7 @@ public class SimulationModelConveyor : SimulationModel } else if (elapseTime > transportTime) { - moveTargetCargo = null; + //moveTargetCargo = null; elapseTime = 0; } diff --git a/Assets/WorkSpace/LH/Web/WebConfigLoader.cs b/Assets/WorkSpace/LH/Web/WebConfigLoader.cs index 1f2c818d..6ede2fa6 100644 --- a/Assets/WorkSpace/LH/Web/WebConfigLoader.cs +++ b/Assets/WorkSpace/LH/Web/WebConfigLoader.cs @@ -10,7 +10,7 @@ namespace UVC.Networks public string Token { get; private set; } #if UNITY_EDITOR //public string BaseUrl => $"{Host}:{Port}"; - public string BaseUrl => $"{Host}:{Port}"; + public string BaseUrl => $"{Host}"; #else public string BaseUrl => $"{Host}"; #endif