diff --git a/Assets/New Folder/Queue.meta b/Assets/New Folder/Queue.meta new file mode 100644 index 00000000..341a103f --- /dev/null +++ b/Assets/New Folder/Queue.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33ad617bfa3fd4547801aac9cd2c242f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/New Folder/Queue/Queue_Mat.mat b/Assets/New Folder/Queue/Queue_Mat.mat new file mode 100644 index 00000000..24a8b22a --- /dev/null +++ b/Assets/New Folder/Queue/Queue_Mat.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4666433945317652781 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Queue_Mat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: d106ddc054fbea344b0451c957681737, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d106ddc054fbea344b0451c957681737, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.003921569, g: 0.003921569, b: 0.003921569, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/New Folder/Queue/Queue_Mat.mat.meta b/Assets/New Folder/Queue/Queue_Mat.mat.meta new file mode 100644 index 00000000..ef5f2a57 --- /dev/null +++ b/Assets/New Folder/Queue/Queue_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3974faab9964514a80510f6cb40d63f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/New Folder/Queue/Queue_Texture.png b/Assets/New Folder/Queue/Queue_Texture.png new file mode 100644 index 00000000..5c841154 Binary files /dev/null and b/Assets/New Folder/Queue/Queue_Texture.png differ diff --git a/Assets/New Folder/Queue/Queue_Texture.png.meta b/Assets/New Folder/Queue/Queue_Texture.png.meta new file mode 100644 index 00000000..ac9f59d1 --- /dev/null +++ b/Assets/New Folder/Queue/Queue_Texture.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 998db4dedbbafc649aa0add1100a242c +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/New Folder/Queue/area.png b/Assets/New Folder/Queue/area.png new file mode 100644 index 00000000..76ddb62d Binary files /dev/null and b/Assets/New Folder/Queue/area.png differ diff --git a/Assets/New Folder/Queue/area.png.meta b/Assets/New Folder/Queue/area.png.meta new file mode 100644 index 00000000..1bc96b1c --- /dev/null +++ b/Assets/New Folder/Queue/area.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: d106ddc054fbea344b0451c957681737 +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/Images/40simaul.png b/Assets/Resources/Images/40simaul.png new file mode 100644 index 00000000..b410827d Binary files /dev/null and b/Assets/Resources/Images/40simaul.png differ diff --git a/Assets/Resources/Images/40simaul.png.meta b/Assets/Resources/Images/40simaul.png.meta new file mode 100644 index 00000000..d387c7a3 --- /dev/null +++ b/Assets/Resources/Images/40simaul.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: a0d42a47d6eb2f9439752390775a889c +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/Images/Group 11.png b/Assets/Resources/Images/Group 11.png new file mode 100644 index 00000000..df8e1c0d Binary files /dev/null and b/Assets/Resources/Images/Group 11.png differ diff --git a/Assets/Resources/Images/Group 11.png.meta b/Assets/Resources/Images/Group 11.png.meta new file mode 100644 index 00000000..a57e059a --- /dev/null +++ b/Assets/Resources/Images/Group 11.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 0eecbd02211b35c4f86758339e9087f6 +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/Images/save.png b/Assets/Resources/Images/save.png new file mode 100644 index 00000000..f72ee491 Binary files /dev/null and b/Assets/Resources/Images/save.png differ diff --git a/Assets/Resources/Images/save.png.meta b/Assets/Resources/Images/save.png.meta new file mode 100644 index 00000000..59b9e1a1 --- /dev/null +++ b/Assets/Resources/Images/save.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 497a5259af87f6741b2b546cee4e2e6c +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/Prefabs/Box.prefab b/Assets/Resources/Prefabs/Box.prefab index 832f9578..a2e6c04d 100644 --- a/Assets/Resources/Prefabs/Box.prefab +++ b/Assets/Resources/Prefabs/Box.prefab @@ -81,6 +81,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: name: + renderers: [] --- !u!114 &-5636001466114236410 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Queue.prefab b/Assets/Resources/Prefabs/Queue.prefab index 6abcbe67..c2c26733 100644 --- a/Assets/Resources/Prefabs/Queue.prefab +++ b/Assets/Resources/Prefabs/Queue.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1279358654531482484 +--- !u!1 &3498162382746687085 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,41 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6674676463075166198} - m_Layer: 0 - m_Name: EntitySocket - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6674676463075166198 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1279358654531482484} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.25, z: 0.275} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7612062045445863488} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7127134104842724090 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7612062045445863488} - - component: {fileID: 6776969165527300069} - - component: {fileID: 8784366478353187631} - - component: {fileID: 1907041152662014465} + - component: {fileID: 8627665739256720337} + - component: {fileID: 2491027776439349713} + - component: {fileID: 2765000747675012222} + - component: {fileID: 7287783645703458577} m_Layer: 0 m_Name: Queue m_TagString: Untagged @@ -50,37 +19,37 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7612062045445863488 +--- !u!4 &8627665739256720337 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7127134104842724090} + m_GameObject: {fileID: 3498162382746687085} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + 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_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6674676463075166198} + - {fileID: 4518804929476342564} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6776969165527300069 +--- !u!33 &2491027776439349713 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7127134104842724090} - m_Mesh: {fileID: -1954522100336267264, guid: 30920e2de7c0e1247afa7830525afde9, type: 3} ---- !u!23 &8784366478353187631 + m_GameObject: {fileID: 3498162382746687085} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2765000747675012222 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7127134104842724090} + m_GameObject: {fileID: 3498162382746687085} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -94,10 +63,12 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: bf1cb15effa36ba45932e4cd362265bd, type: 2} + - {fileID: 2100000, guid: c3974faab9964514a80510f6cb40d63f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -115,21 +86,54 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1907041152662014465 +--- !u!114 &7287783645703458577 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7127134104842724090} + m_GameObject: {fileID: 3498162382746687085} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a4c1c358f5a165d4e8cf781ec680c15a, type: 3} m_Name: - m_EditorClassIdentifier: + m_EditorClassIdentifier: Assembly-CSharp::Simulator.Data.QueueComponent componentType: 3 - entitySocket: {fileID: 1279358654531482484} + pivot: {fileID: 0} + entitySocket: {fileID: 6233374060968933948} +--- !u!1 &6233374060968933948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4518804929476342564} + m_Layer: 0 + m_Name: entitySocket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4518804929476342564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233374060968933948} + 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: 8627665739256720337} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Prefabs/Queue.prefab.meta b/Assets/Resources/Prefabs/Queue.prefab.meta index 35b43e90..03dd66f7 100644 --- a/Assets/Resources/Prefabs/Queue.prefab.meta +++ b/Assets/Resources/Prefabs/Queue.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 155f9611dbab07547ae0d57f1eb30255 +guid: 672406a52d17b6e4a81fbc270de49584 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Simulator.unity b/Assets/Scenes/Simulator.unity index 7b881855..30b84b55 100644 --- a/Assets/Scenes/Simulator.unity +++ b/Assets/Scenes/Simulator.unity @@ -3158,10 +3158,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: f2c3cae590b761340b56b23a10cb7023, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: 386fa03a7c21cf64fb207f04b91e25a0, type: 3} m_PressedSprite: {fileID: 21300000, guid: f2c3cae590b761340b56b23a10cb7023, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: f2c3cae590b761340b56b23a10cb7023, type: 3} - m_DisabledSprite: {fileID: 21300000, guid: 386fa03a7c21cf64fb207f04b91e25a0, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 386fa03a7c21cf64fb207f04b91e25a0, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: a0d42a47d6eb2f9439752390775a889c, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -3499,10 +3499,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: a2a85ef9426add24c800b9a4d2b893b7, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: c09cf8b5c3ec45941828b65ca933cd9b, type: 3} m_PressedSprite: {fileID: 21300000, guid: a2a85ef9426add24c800b9a4d2b893b7, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: a2a85ef9426add24c800b9a4d2b893b7, type: 3} - m_DisabledSprite: {fileID: 21300000, guid: c09cf8b5c3ec45941828b65ca933cd9b, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: c09cf8b5c3ec45941828b65ca933cd9b, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 497a5259af87f6741b2b546cee4e2e6c, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -5085,7 +5085,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1377996960358852691, guid: 6d159c66df8395a40b6e819f4ef72a95, type: 3} propertyPath: m_Intensity - value: 1.21 + value: 1.3 objectReference: {fileID: 0} - target: {fileID: 1377996960358852691, guid: 6d159c66df8395a40b6e819f4ef72a95, type: 3} propertyPath: m_ColorTemperature @@ -5248,6 +5248,8 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::SimulationTitleText simulationNameTxt: {fileID: 1014883560} userNameTxt: {fileID: 803968255} + runButton: {fileID: 825818369} + saveButton: {fileID: 905734407} --- !u!1 &1565732967 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Simulator/Components/ComponentsManager.cs b/Assets/Scripts/Simulator/Components/ComponentsManager.cs index dff7d298..2a66724b 100644 --- a/Assets/Scripts/Simulator/Components/ComponentsManager.cs +++ b/Assets/Scripts/Simulator/Components/ComponentsManager.cs @@ -30,7 +30,7 @@ namespace Simulator.Data {"worker","prefabs/Worker"} }; - public Dictionary componentDatas = new Dictionary(); + Dictionary componentDatas = new Dictionary(); Dictionary dataMapperDict = new Dictionary(); private GameObjectPool? sourcePool; @@ -187,28 +187,16 @@ namespace Simulator.Data InitializeRackPoolAsync().ContinueWith(() => { var rackDataMask = new DataMask(); - rackDataMask.ObjectName = "Rack"; + rackDataMask.ObjectName = "rack"; rackDataMask.ObjectIdKey = "component_id"; - rackDataMask["component_id"] = ""; - rackDataMask["event_name"] = ""; - rackDataMask["timestamp"] = new DateTime(); - rackDataMask["data"] = new DataMask() - { - ["entity_id"] = "", - ["coordinates"] = new DataMask() - { - ["x"] = 0, - ["y"] = 0, - ["z"] = 0 - } - }; - DataMapper rackmapper = new DataMapper(rackDataMask); dataMapperDict.Add(ComponentType.Rack, rackmapper); }); InitializeAsrsPoolAsync().ContinueWith(() => { var asrsDataMask = new DataMask(); + asrsDataMask.ObjectName = "asrs"; + asrsDataMask.ObjectIdKey = "component_id"; DataMapper asrsmapper = new DataMapper(asrsDataMask); dataMapperDict.Add(ComponentType.ASRS, asrsmapper); }); @@ -328,7 +316,7 @@ namespace Simulator.Data foreach (var componentdata in componentDatas) { DataRepository.Instance.MqttReceiver.AddTopic($"simulation/{SimulationConfig.SimulationCode}/components/+/{componentdata.Key}/#"); - var mqttConfig = new MqttSubscriptionConfig($"simulation/{SimulationConfig.SimulationCode}/components/+/{componentdata.Key}/#"); + var mqttConfig = new MqttSubscriptionConfig($"simulation/{SimulationConfig.SimulationCode}/components/+/{componentdata.Key}/#",false); mqttConfig.SetDataMapper(dataMapperDict[componentdata.Value.componentType]); mqttConfig.SetHandler((value) => OnUpdateData(value, componentdata.Value.componentType)); DataRepository.Instance.MqttReceiver.Add(mqttConfig); @@ -371,7 +359,12 @@ namespace Simulator.Data RackComponent? rack = rackPool.GetItem(obj.GetString("component_id")!); rack.GetModelData(obj); } - break; + if (string.Equals(obj.GetString("event_name"), "inventory_initialized")) + { + RackComponent? rack = rackPool.GetItem(obj.GetString("component_id")!); + rack.InitializeQueue(obj); + } + break; case ComponentType.ASRS: ASRSComponent? asrs = asrsPool.GetItem(obj.GetString("component_id")!); asrs.GetModelData(obj); @@ -592,5 +585,14 @@ namespace Simulator.Data } } } + + public ComponentBase GetComponentData(string name) + { + if (componentDatas.ContainsKey(name)) + { + return componentDatas[name]; + } + return null; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Simulator/Components/Conveyor/ConveyorManager.cs b/Assets/Scripts/Simulator/Components/Conveyor/ConveyorManager.cs index 8b986e00..19c30581 100644 --- a/Assets/Scripts/Simulator/Components/Conveyor/ConveyorManager.cs +++ b/Assets/Scripts/Simulator/Components/Conveyor/ConveyorManager.cs @@ -173,8 +173,14 @@ namespace Simulator.Data mesher.UpdateCaps(); mesher.Rebuild(); - mesher.startCap.instances[0].GetComponent().SetComponent(fromNode); - mesher.endCap.instances[0].GetComponent().SetComponent(toNode); + if (mesher.startCap!=null && mesher.startCap.InstanceCount >= 1) + { + mesher.startCap.instances[0].GetComponent().SetComponent(fromNode); + } + if (mesher.endCap!=null&&mesher.endCap.InstanceCount>=1) + { + mesher.endCap.instances[0].GetComponent().SetComponent(toNode); + } // ▼ 추가: station 인접 정보 기록(후처리에서 cap/코너 결정) if (string.Equals(fromNode.node_type, "station")) diff --git a/Assets/Scripts/Simulator/Components/RackComponent.cs b/Assets/Scripts/Simulator/Components/RackComponent.cs index 1ad52b01..064a441a 100644 --- a/Assets/Scripts/Simulator/Components/RackComponent.cs +++ b/Assets/Scripts/Simulator/Components/RackComponent.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Runtime.CompilerServices; using Unity.VisualScripting; using UnityEngine; using UVC.Data.Core; @@ -61,23 +62,20 @@ namespace Simulator.Data { var ty = to_position.GetInt("y").Value; var tz = to_position.GetInt("z").Value; Vector3 toVector3 = new Vector3(tx, ty, tz); - //var entityIds = datas["entities"].ConvertTo>(); - //var entities=EntityManager.Instance.SpawnEntites(entityIds, this); + var entity_Ids = datas.GetDataArray("entities"); List entities = new List(); - var entity_Ids = datas.GetDataArray("entity_ids"); + var prefab = datas.GetDataObject("prefab"); foreach (var entity in entity_Ids) { - var id = entity.GetString("entity_id"); - var name = entity.GetString("prefab_name"); - entities.Add(EntityManager.Instance.SpawnEntity(id, this, name)); + entities.Add(EntityManager.Instance.SpawnEntity(entity.GetString("value"), this, prefab.GetString("name"))); } int index = 0; - for (int x = fx; x < tx; x++) + for (int x = fx; x <= tx; x++) { - for(int y = fy; y < fy; y++) + for(int y = fy; y <= ty; y++) { - for(int z = fz; z < fz; z++) + for(int z = fz; z <= tz; z++) { SetEntityToCell(entities[index++], (x, y, z)); } @@ -95,6 +93,7 @@ namespace Simulator.Data { public void SpawnCell(rack_layout layout,bool asrs) { + for (int z = 0; z < layout.z; z++) { for(int y=0;y {asrs.physical.position.x = v.x;asrs.physical.position.z = v.y; SaveChange(asrs,v,"physical.position"); } )*/ CreatePositionGroup(asrs), - new ButtonProperty("InitializeButton","초기 재고 설정",""){ - }.BindClick(()=>FindAnyObjectByType(FindObjectsInactive.Include).Open(asrs)), new BoolProperty("limited","용량 무제한", asrs.is_unlimited) { IsReadOnly=false @@ -59,14 +57,18 @@ public class ASRSProperty : MonoBehaviour setter: v => {asrs.is_unlimited=v; SaveChange(asrs,v,"is_unlimited"); } ), CreateRackLayoutGroup(asrs), + new ButtonProperty("InitializeButton","초기 재고 설정",""){ + }.BindClick(()=>FindAnyObjectByType(FindObjectsInactive.Include).Open(asrs)), + /* new IntProperty("entityperblock","칸당 개체 개수", asrs.entity_count_per_block) { IsReadOnly=false }.Bind( setter: v => {asrs.entity_count_per_block=v; SaveChange(asrs,v,"entity_count_per_block"); } ), + */ new EnumProperty("display_mode_ReceicingTimePolicy", "입고 시간 정책",asrs.receiving_time_policy.policy).Bind( - setter: v=>{asrs.receiving_time_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,v.ToString(),"receiving_time_policy.type");} + setter: v=>{asrs.receiving_time_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,PolicyFactory.Create(v.ToString()),"receiving_time_policy");} ), CreateReceivingTimePolicy_Constant(asrs), CreateReceivingTimePolicy_Normal(asrs), @@ -75,7 +77,7 @@ public class ASRSProperty : MonoBehaviour CreateReceivingTimePolicy_Triangular(asrs), new EnumProperty("display_mode_ShippingTimePolicy", "출고 시간 정책",asrs.shipping_time_policy.policy).Bind( - setter: v=>{asrs.shipping_time_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,v.ToString(),"shipping_time_policy.type");} + setter: v=>{asrs.shipping_time_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,PolicyFactory.Create(v.ToString()),"shipping_time_policy");} ), CreateShippingTimePolicy_Constant(asrs), CreateShippingTimePolicy_Normal(asrs), @@ -84,7 +86,7 @@ public class ASRSProperty : MonoBehaviour CreateShippingTimePolicy_Triangular(asrs), new EnumProperty("display_mode_StorageCostPolicy", "보관 비용 정책",asrs.storage_cost_policy.policy).Bind( - setter: v=>{asrs.storage_cost_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,v.ToString(),"storage_cost_policy.type");} + setter: v=>{asrs.storage_cost_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,PolicyFactory.Create(v.ToString()),"storage_cost_policy");} ), CreateStorageCostPolicy_Constant(asrs), CreateStorageCostPolicy_Normal(asrs), @@ -93,7 +95,7 @@ public class ASRSProperty : MonoBehaviour CreateStorageCostPolicy_Triangular(asrs), new EnumProperty("display_mode_HorizonSpeedPolicy", "크레인 수평 이동 속도",asrs.horizon_speed_policy.policy).Bind( - setter: v=>{asrs.horizon_speed_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,v.ToString(),"horizon_speed_policy.type");} + setter: v=>{asrs.horizon_speed_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,PolicyFactory.Create(v.ToString()),"horizon_speed_policy");} ), CreateHorizonSpeedPolicy_Constant(asrs), CreateHorizonSpeedPolicy_Normal(asrs), @@ -102,7 +104,7 @@ public class ASRSProperty : MonoBehaviour CreateHorizonSpeedPolicy_Triangular(asrs), new EnumProperty("display_mode_VerticalSpeedPolicy", "크레인 수직 이동 속도",asrs.vertical_speed_policy.policy).Bind( - setter: v=>{asrs.vertical_speed_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,v.ToString(),"vertical_speed_policy.type");} + setter: v=>{asrs.vertical_speed_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,PolicyFactory.Create(v.ToString()),"vertical_speed_policy");} ), CreateVerticalSpeedPolicy_Constant(asrs), CreateVerticalSpeedPolicy_Normal(asrs), @@ -111,7 +113,7 @@ public class ASRSProperty : MonoBehaviour CreateVerticalSpeedPolicy_Triangular(asrs), new EnumProperty("display_mode_ForkCycleTimePolicy", "크레인 포크 이동 시간",asrs.fork_cycle_time_policy.policy).Bind( - setter: v=>{asrs.fork_cycle_time_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,v.ToString(),"fork_cycle_time_policy.type");} + setter: v=>{asrs.fork_cycle_time_policy=PolicyFactory.Create(v.ToString());SaveChange(asrs,PolicyFactory.Create(v.ToString()),"fork_cycle_time_policy");} ), CreateForkCycleTimePolicy_Constant(asrs), CreateForkCycleTimePolicy_Normal(asrs), diff --git a/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/GridView.cs b/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/GridView.cs index 64305a80..517a208f 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/GridView.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/GridView.cs @@ -38,9 +38,9 @@ public class GridView : MonoBehaviour cells.Clear(); // 위가 큰 y가 되도록 내림차순 - for (int y = sizeY; y >= 1; y--) + for (int y = sizeY-1; y >= 0; y--) { - for (int x = 1; x <= sizeX; x++) + for (int x = 0; x < sizeX; x++) { var cell = Instantiate(cellPrefab, grid.transform); cell.Init(this, rackIndex, x, y); diff --git a/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/InitialInventoryWindow.cs b/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/InitialInventoryWindow.cs index 43698306..7012370e 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/InitialInventoryWindow.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/InitailizePopup/InitialInventoryWindow.cs @@ -120,7 +120,7 @@ public class InitialInventoryWindow : MonoBehaviour OpenInternal( layout, getter: () => asrs.initialize, - setter: list => asrs.initialize = list, + setter: list => { asrs.initialize = list; SaveChange(asrs, list, "initialize"); }, mode: DimLabelMode.Asrs ); } @@ -261,9 +261,9 @@ public class InitialInventoryWindow : MonoBehaviour Destroy(child.gameObject); rackViews.Clear(); - int rackCount = Mathf.Clamp(l.z, 1, 2); + int rackCount = Mathf.Clamp(l.z-1, 0, 1); - for (int rackIndex = 1; rackIndex <= rackCount; rackIndex++) + for (int rackIndex = 0; rackIndex <= rackCount; rackIndex++) { var view = Instantiate(rackSectionPrefab, rackContainer); view.Build(this, rackIndex, l.x, l.y); diff --git a/Assets/Scripts/Simulator/PropertyWindow/NodeProperty.cs b/Assets/Scripts/Simulator/PropertyWindow/NodeProperty.cs index 193aa78a..94644b6a 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/NodeProperty.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/NodeProperty.cs @@ -58,7 +58,7 @@ public class NodeProperty : MonoBehaviour setter: v => {node.capacity = v;SaveChange(node,v,"capacity"); } ), new EnumProperty("display_mode_ProcessingTimePolicy", "보관 비용 정책",node.processing_time_policy.policy).Bind( - setter: v=>{node.processing_time_policy=PolicyFactory.Create(v.ToString());SaveChange(node,v.ToString(),"processing_time_policy.type");} + setter: v=>{node.processing_time_policy=PolicyFactory.Create(v.ToString());SaveChange(node,PolicyFactory.Create(v.ToString()),"processing_time_policy");} ), CreateProcessingTimePolicy_Constant(node), CreateProcessingTimePolicy_Normal(node), diff --git a/Assets/Scripts/Simulator/PropertyWindow/ProcessorProperty.cs b/Assets/Scripts/Simulator/PropertyWindow/ProcessorProperty.cs index 6de1a0f1..bc9d30a2 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/ProcessorProperty.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/ProcessorProperty.cs @@ -84,7 +84,7 @@ public class ProcessorProperty : MonoBehaviour entries.Add(new EnumProperty("display_mode_ProcessingTimePolicy", "처리 시간 정책", processor.processing_time_policy.policy).Bind( setter: v => { - processor.processing_time_policy = PolicyFactory.Create(v.ToString()); SaveChange(processor, v.ToString(), "processing_time_policy.type"); + processor.processing_time_policy = PolicyFactory.Create(v.ToString()); SaveChange(processor, PolicyFactory.Create(v.ToString()), "processing_time_policy"); })); entries.Add(CreateProcessingTimePolicy_Constant(processor)); entries.Add(CreateProcessingTimePolicy_Normal(processor)); @@ -104,7 +104,7 @@ public class ProcessorProperty : MonoBehaviour entries.Add(new EnumProperty("display_mode_ReadyTimePolicy", "준비 시간 정책", processor.ready_time_policy.policy).Bind( setter: v => { - processor.ready_time_policy = PolicyFactory.Create(v.ToString()); SaveChange(processor, v.ToString(), "ready_time_policy.type"); + processor.ready_time_policy = PolicyFactory.Create(v.ToString()); SaveChange(processor, PolicyFactory.Create(v.ToString()), "ready_time_policy"); })); entries.Add(CreateReadyTimePolicy_Constant(processor)); entries.Add(CreateReadyTimePolicy_Normal(processor)); @@ -115,7 +115,7 @@ public class ProcessorProperty : MonoBehaviour entries.Add(new EnumProperty("display_mode_DefectTimePolicy", "불량률 정책", processor.defect_rate_policy.policy).Bind( setter: v => { - processor.defect_rate_policy = PolicyFactory.Create(v.ToString()); SaveChange(processor, v.ToString(), "defect_rate_policy.type"); + processor.defect_rate_policy = PolicyFactory.Create(v.ToString()); SaveChange(processor, PolicyFactory.Create(v.ToString()), "defect_rate_policy"); })); entries.Add(CreateDefectRatePolicy_Constant(processor)); entries.Add(CreateDefectRatePolicy_Normal(processor)); diff --git a/Assets/Scripts/Simulator/PropertyWindow/QueueProperty.cs b/Assets/Scripts/Simulator/PropertyWindow/QueueProperty.cs index 8f0a378d..3d93e083 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/QueueProperty.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/QueueProperty.cs @@ -61,7 +61,7 @@ public class QueueProperty : MonoBehaviour { IsReadOnly=false }.Bind( - setter: v=>{queue.cost_policy=PolicyFactory.Create(v.ToString());SaveChange(queue,v.ToString(),"cost_policy.type");} + setter: v=>{queue.cost_policy=PolicyFactory.Create(v.ToString());SaveChange(queue,PolicyFactory.Create(v.ToString()),"cost_policy");} ), CreateCostPolicy_Constant(queue), CreateCostPolicy_Normal(queue), diff --git a/Assets/Scripts/Simulator/PropertyWindow/RackProperty.cs b/Assets/Scripts/Simulator/PropertyWindow/RackProperty.cs index 910d2cb0..a7bcbef4 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/RackProperty.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/RackProperty.cs @@ -50,16 +50,18 @@ public class RackProperty : MonoBehaviour setter: v => {rack.is_unlimited=v; SaveChange(rack,v,"is_unlimited"); } ), CreateRackLayoutGroup(rack), + /* new IntProperty("entityperblock","칸당 개체 개수", rack.entity_count_per_block) { IsReadOnly=false }.Bind( setter: v => {rack.entity_count_per_block=v; SaveChange(rack,v,"entity_count_per_block"); } ), + */ new ButtonProperty("InitializeButton","초기 재고 설정",""){ }.BindClick(()=>FindAnyObjectByType(FindObjectsInactive.Include).OpenRack(rack,PathIndexer.GetNodePath(rack))), new EnumProperty("display_mode_ReceicingTimePolicy", "입고 시간 정책",rack.receiving_time_policy.policy).Bind( - setter: v=>{rack.receiving_time_policy=PolicyFactory.Create(v.ToString());SaveChange(rack,v.ToString(),"receiving_time_policy.type");} + setter: v=>{rack.receiving_time_policy=PolicyFactory.Create(v.ToString());SaveChange(rack,PolicyFactory.Create(v.ToString()),"receiving_time_policy");} ), CreateReceivingTimePolicy_Constant(rack), CreateReceivingTimePolicy_Normal(rack), @@ -68,7 +70,7 @@ public class RackProperty : MonoBehaviour CreateReceivingTimePolicy_Triangular(rack), new EnumProperty("display_mode_ShippingTimePolicy", "출고 시간 정책",rack.shipping_time_policy.policy).Bind( - setter: v=>{rack.shipping_time_policy=PolicyFactory.Create(v.ToString());SaveChange(rack,v.ToString(),"shipping_time_policy.type");} + setter: v=>{rack.shipping_time_policy=PolicyFactory.Create(v.ToString());SaveChange(rack,PolicyFactory.Create(v.ToString()),"shipping_time_policy");} ), CreateShippingTimePolicy_Constant(rack), CreateShippingTimePolicy_Normal(rack), @@ -77,7 +79,7 @@ public class RackProperty : MonoBehaviour CreateShippingTimePolicy_Triangular(rack), new EnumProperty("display_mode_StorageCostPolicy", "보관 비용 정책",rack.storage_cost_policy.policy).Bind( - setter: v=>{rack.storage_cost_policy=PolicyFactory.Create(v.ToString());SaveChange(rack,v.ToString(),"storage_cost_policy.type");} + setter: v=>{rack.storage_cost_policy=PolicyFactory.Create(v.ToString());SaveChange(rack,PolicyFactory.Create(v.ToString()),"storage_cost_policy");} ), CreateStorageCostPolicy_Constant(rack), CreateStorageCostPolicy_Normal(rack), diff --git a/Assets/Scripts/Simulator/PropertyWindow/RobotArmProperty.cs b/Assets/Scripts/Simulator/PropertyWindow/RobotArmProperty.cs index 56722f36..d772d3b6 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/RobotArmProperty.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/RobotArmProperty.cs @@ -45,7 +45,7 @@ public class RobotArmProperty : MonoBehaviour ), CreatePositionGroup(robotArm), new EnumProperty("display_mode_RobotArmSpeedPolicy", "로봇팔 속도 정책",robotArm.robot_arm_speed_policy.policy).Bind( - setter: v=>{robotArm.robot_arm_speed_policy=PolicyFactory.Create(v.ToString());SaveChange(robotArm,v.ToString(),"robot_arm_speed_policy.type");} + setter: v=>{robotArm.robot_arm_speed_policy=PolicyFactory.Create(v.ToString());SaveChange(robotArm,PolicyFactory.Create(v.ToString()),"robot_arm_speed_policy");} ), CreateRobotArmSpeedPolicy_Constant(robotArm), CreateRobotArmSpeedPolicy_Normal(robotArm), @@ -54,7 +54,7 @@ public class RobotArmProperty : MonoBehaviour CreateRobotArmSpeedPolicy_Triangular(robotArm), new EnumProperty("display_mode_FailureRatePolicy", "고장률 정책",robotArm.failure_rate_policy.policy).Bind( - setter: v=>{robotArm.failure_rate_policy=PolicyFactory.Create(v.ToString());SaveChange(robotArm,v.ToString(),"failure_rate_policy.type");} + setter: v=>{robotArm.failure_rate_policy=PolicyFactory.Create(v.ToString());SaveChange(robotArm,PolicyFactory.Create(v.ToString()),"failure_rate_policy");} ), CreateFailureRatePolicy_Constant(robotArm), CreateFailureRatePolicy_Normal(robotArm), @@ -63,7 +63,7 @@ public class RobotArmProperty : MonoBehaviour CreateFailureRatePolicy_Triangular(robotArm), new EnumProperty("display_mode_RepairTimePolicy", "수리 시간 정책",robotArm.repair_time_policy.policy).Bind( - setter: v=>{robotArm.repair_time_policy=PolicyFactory.Create(v.ToString());SaveChange(robotArm,v.ToString(),"repair_time_policy.type");} + setter: v=>{robotArm.repair_time_policy=PolicyFactory.Create(v.ToString());SaveChange(robotArm,PolicyFactory.Create(v.ToString()),"repair_time_policy");} ), CreateRepairTimePolicy_Constant(robotArm), CreateRepairTimePolicy_Normal(robotArm), diff --git a/Assets/Scripts/Simulator/PropertyWindow/SourceProperty.cs b/Assets/Scripts/Simulator/PropertyWindow/SourceProperty.cs index 9968dea9..4f84419a 100644 --- a/Assets/Scripts/Simulator/PropertyWindow/SourceProperty.cs +++ b/Assets/Scripts/Simulator/PropertyWindow/SourceProperty.cs @@ -64,7 +64,7 @@ public class SourceProperty : MonoBehaviour setter: v => {source.prefab=v; SaveChange(source,v,"prefab"); } ), new EnumProperty("display_mode_TimePolicy", "생산 간격 정책",source.spawn_time_policy.policy).Bind( - setter: v=>{source.spawn_time_policy=PolicyFactory.Create(v.ToString());SaveChange(source,v.ToString(),"spawn_time_policy.type");} + setter: v=>{source.spawn_time_policy=PolicyFactory.Create(v.ToString());SaveChange(source,PolicyFactory.Create(v.ToString()),"spawn_time_policy");} ), CreateSpawnTimePolicy_Constant(source), CreateSpawnTimePolicy_Normal(source), @@ -73,7 +73,7 @@ public class SourceProperty : MonoBehaviour CreateSpawnTimePolicy_Triangular(source), new EnumProperty("display_mode_CountPolicy", "생산 개수 정책",source.spawn_count_policy.policy).Bind( - setter: v=>{source.spawn_count_policy=PolicyFactory.Create(v.ToString());SaveChange(source,v.ToString(),"spawn_count_policy.type");} + setter: v=>{source.spawn_count_policy=PolicyFactory.Create(v.ToString());SaveChange(source,PolicyFactory.Create(v.ToString()),"spawn_count_policy");} ), CreateSpawnCountPolicy_Constant(source), CreateSpawnCountPolicy_Normal(source), @@ -92,7 +92,7 @@ public class SourceProperty : MonoBehaviour ), new EnumProperty("display_mode_DefectPolicy", "불량률 정책",source.defect_rate_policy.policy).Bind( - setter: v=>{source.defect_rate_policy=PolicyFactory.Create(v.ToString());SaveChange(source,v.ToString(),"defect_rate_policy.type");} + setter: v=>{source.defect_rate_policy=PolicyFactory.Create(v.ToString());SaveChange(source,PolicyFactory.Create(v.ToString()),"defect_rate_policy");} ), CreateSpawnDefectPolicy_Constant(source), CreateSpawnDefectPolicy_Normal(source), diff --git a/Assets/Scripts/Simulator/WebReceiver.cs b/Assets/Scripts/Simulator/WebReceiver.cs index aca2ba73..405c1f0d 100644 --- a/Assets/Scripts/Simulator/WebReceiver.cs +++ b/Assets/Scripts/Simulator/WebReceiver.cs @@ -19,8 +19,8 @@ namespace Simulator onWebParameterRecived += ComponentsManager.Instance.testRequest; onCameraReceived += FactoryCameraController.Instance.SetCamera; #if UNITY_EDITOR - SimulationConfig.projectId = 467; - SimulationConfig.logicId = 478; + SimulationConfig.projectId = 413; + SimulationConfig.logicId = 424; onWebParameterRecived?.Invoke(); DataRepository.Instance.MqttReceiver.SetDomainPort(Constants.MQTT_DOMAIN, Constants.MQTT_PORT); #else diff --git a/Assets/Scripts/UVC/TopUI/SimulationTitleText.cs b/Assets/Scripts/UVC/TopUI/SimulationTitleText.cs index 9cf2c921..a9158eaa 100644 --- a/Assets/Scripts/UVC/TopUI/SimulationTitleText.cs +++ b/Assets/Scripts/UVC/TopUI/SimulationTitleText.cs @@ -9,11 +9,16 @@ public class SimulationTitleText : MonoBehaviour TMP_Text simulationNameTxt; [SerializeField] TMP_Text userNameTxt; + [SerializeField] + Button runButton; + [SerializeField] + Button saveButton; private void Start() { ComponentsManager.Instance.onProjectNameRecieved += UpdateProjectText; ComponentsManager.Instance.onUserNameRecieved += UpdateUserText; + PlayerPropertyDataBase.Instance.onPlay += (value) => SetActiveButton(); } void UpdateProjectText(string data) @@ -27,4 +32,10 @@ public class SimulationTitleText : MonoBehaviour userNameTxt.text = data; LayoutRebuilder.ForceRebuildLayoutImmediate(this.GetComponent()); } + + void SetActiveButton() + { + runButton.interactable = false; + saveButton.interactable = false; + } } diff --git a/Assets/white.mat b/Assets/white.mat index de077507..cd03c09d 100644 --- a/Assets/white.mat +++ b/Assets/white.mat @@ -119,7 +119,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 1 + - _Smoothness: 0.85 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1