Compare commits

...

10 Commits

Author SHA1 Message Date
d6b6723f5b proto_End 2025-04-01 17:38:23 +09:00
6d2dca8e37 Merge branch 'lh/prototype_0328' into lh/0328_Prototype 2025-03-28 12:48:40 +09:00
212c96f620 build1 2025-03-28 12:46:03 +09:00
d628b43442 Merge branch 'lh/prototype2' into lh/prototype_0328 2025-03-28 09:31:20 +09:00
8073eb357e uichange 2025-03-28 09:27:27 +09:00
e22dd71087 22 2025-03-27 16:05:24 +09:00
6a64f01bb6 Merge branch 'lh/prototype' into lh/prototype2 2025-03-27 13:44:57 +09:00
3c8ca3f15d ui 2025-03-27 13:40:04 +09:00
6b3dd414f9 Merge branch 'lh/20250317' into lh/prototype 2025-03-25 17:53:07 +09:00
f21d70923a prototype 2025-03-25 17:47:14 +09:00
43 changed files with 3386 additions and 744 deletions

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 4a1d48d42fb1a3745ac549ee8a7dc869
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 08dea8a16e0b02f99cf9f5ca92193e25
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_CatalogRequestsTimeout: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 35f56e96d39c94841b5e5f3b8cadf6f9
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: a02135d686d97d44b99a631bc3e4d771
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: b6227a9f0a97531438b38d81271ece83
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 775 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 646caa5325f778b48aa7034743aea394
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: b2721b0f373df3c4bb326e5540eba3d5
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: c56abd09fa7f33e4f921486db82fd293
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 239cc765347f90c4bbf520a25ed62d78
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
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 37397e6e5c8210f47bbfdba63ea38449
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
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:

View File

@@ -34,6 +34,7 @@ Transform:
m_Children:
- {fileID: 3909547189796084948}
- {fileID: 1627652318861080814}
- {fileID: 6477406270014598348}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3521821355188594447
@@ -48,23 +49,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 84fe5a7ef78a7af498da388fc7c38ac3, type: 3}
m_Name:
m_EditorClassIdentifier:
physics:
areabox: {fileID: 0}
metaData:
address:
modeling: {fileID: 0}
portrait: {fileID: 0}
assetLabel: 0
IsDisplayable: 0
IsInteractible: 0
state: 0
spec: {fileID: 0}
battery:
agvTask: 0
agvState: 0
senseObstacleState: 0
specData: {fileID: 11400000, guid: 3124e65e4d238e24aa9f78f93282ff84, type: 2}
agvBattery:
currentBatteryState: 0
bc: 100
currentNode: {fileID: 0}
currentMovePath: []
lift: {fileID: 6814672540003804564}
id:
moveSpeed: 10
lift: {fileID: 6204755932358581132}
pickupSocket: {fileID: 7175446550791974323}
load: {fileID: 0}
chargeZone: {fileID: 0}
charging: 0
obstacleLayer:
serializedVersion: 2
m_Bits: 0
--- !u!54 &3077797501209030249
Rigidbody:
m_ObjectHideFlags: 0
@@ -271,10 +272,7 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 7154835845995298155, guid: 586ca79ec44844746b347929276fc0e6, type: 3}
insertIndex: -1
addedObject: {fileID: 8278436267998297966}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6070737613420926900, guid: 586ca79ec44844746b347929276fc0e6, type: 3}
insertIndex: -1
addedObject: {fileID: 5083700428396174471}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 586ca79ec44844746b347929276fc0e6, type: 3}
--- !u!4 &3909547189796084948 stripped
Transform:
@@ -286,25 +284,70 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 6070737613420926900, guid: 586ca79ec44844746b347929276fc0e6, type: 3}
m_PrefabInstance: {fileID: 154300052577553464}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5083700428396174471
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6204755932358581132}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5fb7059a769257346badd43882bceb27, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &6814672540003804564 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6680733278384466348, guid: 586ca79ec44844746b347929276fc0e6, type: 3}
m_PrefabInstance: {fileID: 154300052577553464}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7020894527220248915 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7154835845995298155, guid: 586ca79ec44844746b347929276fc0e6, type: 3}
m_PrefabInstance: {fileID: 154300052577553464}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4506923798232004478
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 421374873455346910}
m_Modifications:
- target: {fileID: 3585663751663173038, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_Name
value: AMR_300KG
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
--- !u!4 &6477406270014598348 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7453336436369316786, guid: b8c508f5e832ed744bdfee97878d1480, type: 3}
m_PrefabInstance: {fileID: 4506923798232004478}
m_PrefabAsset: {fileID: 0}

View File

@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 101037460302490810}
- component: {fileID: 8345823861534365305}
- component: {fileID: 3946417520548705293}
- component: {fileID: 3474682675377706932}
m_Layer: 0
m_Name: DataGenerator
m_TagString: Untagged
@@ -60,3 +61,18 @@ MonoBehaviour:
separator: '@'
datas: []
ReplayTimer: {fileID: 0}
--- !u!114 &3474682675377706932
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7363357197736599361}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2e556b036cc037846bd6d4e63e56bd36, type: 3}
m_Name:
m_EditorClassIdentifier:
Pallet: {fileID: 5867088622668424544, guid: ae5747be47a574449988f6a5ccd509b5, type: 3}
selectedObject: {fileID: 0}
panel_AssetEdit: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@@ -105,7 +105,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.1254902, g: 0.10980392, b: 0.16470589, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -196,8 +196,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281083944
m_fontColor: {r: 0.15686275, g: 0.15686275, b: 0.17254902, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -327,7 +327,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 02855774f1139394b8fbe75b73c9edfe, type: 3}
m_Sprite: {fileID: 21300000, guid: b2721b0f373df3c4bb326e5540eba3d5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -636,14 +636,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0179547eff27daf4e8f258c40b1a47b5, type: 3}
m_Sprite: {fileID: 21300000, guid: 646caa5325f778b48aa7034743aea394, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -772,8 +772,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 2155114351
m_fontColor: {r: 0.43529412, g: 0.43529412, b: 0.45490196, a: 0.5}
rgba: 2164260863
m_fontColor: {r: 1, g: 1, b: 1, a: 0.5}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1245,7 +1245,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 127132f18f0b3a34eb9290294cf9f829, type: 3}
m_Sprite: {fileID: 21300000, guid: c56abd09fa7f33e4f921486db82fd293, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2197,6 +2197,9 @@ MonoBehaviour:
m_Calls: []
itemPopup: {fileID: 0}
menuPopup: {fileID: 0}
onExit:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2892856486240836700
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2216,6 +2219,9 @@ MonoBehaviour:
onParentChanged:
m_PersistentCalls:
m_Calls: []
onHover:
m_PersistentCalls:
m_Calls: []
isSiblingEditable: 0
--- !u!1 &7962667019419902432
GameObject:
@@ -2326,7 +2332,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -0.00034048597, y: 0.00027677164}
m_AnchoredPosition: {x: -0.00034048597, y: 0.00020732265}
m_SizeDelta: {x: 282.99957, y: 2}
m_Pivot: {x: 0, y: 1}
--- !u!114 &685881772641947593
@@ -2405,7 +2411,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -12, y: 0}
m_SizeDelta: {x: 24, y: 30}
m_SizeDelta: {x: 24, y: 6.25}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &7556095709557165953
CanvasRenderer:
@@ -2435,7 +2441,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 45bf2a0da7b953d43acc43dcc11e4f3a, type: 3}
m_Sprite: {fileID: 21300000, guid: 37397e6e5c8210f47bbfdba63ea38449, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2689,8 +2695,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:

View File

@@ -53,6 +53,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Title: {fileID: 5075257527676429117}
Label: {fileID: 897024924867961300}
title:
Marker: {fileID: 7750026773280362566}
--- !u!1 &2355082812341172708
GameObject:
@@ -128,8 +129,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -225,7 +226,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 139.5, y: 2.25}
m_SizeDelta: {x: 13, y: 13}
m_SizeDelta: {x: 6, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7584773274131355608
CanvasRenderer:
@@ -255,7 +256,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: be4cbf97282d7394bbfeb45a740d6fe7, type: 3}
m_Sprite: {fileID: 21300000, guid: b6227a9f0a97531438b38d81271ece83, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -339,8 +340,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:

View File

@@ -74,8 +74,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -298,7 +298,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7ba72824288e08d4cb3289c7b83c4fb5, type: 3}
m_Sprite: {fileID: 21300000, guid: 239cc765347f90c4bbf520a25ed62d78, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@@ -936,6 +936,50 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &199324787
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 199324788}
- component: {fileID: 199324789}
m_Layer: 0
m_Name: pivot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &199324788
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 199324787}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -7.09, y: 0, z: -0.15}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!114 &199324789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 199324787}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7ca78dd431062bd478c49f958d071b41, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &205918190
GameObject:
m_ObjectHideFlags: 0
@@ -4123,12 +4167,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d9280d9db3dd3f748be73c34921dd1b8, type: 3}
m_Name:
m_EditorClassIdentifier:
panel_accessibilitysettings: {fileID: 0}
panel_colorpicker: {fileID: 0}
panel_componentlibrary: {fileID: 0}
panel_assetlibrary: {fileID: 0}
panel_interworkingdatalist: {fileID: 0}
panel_assetproperties: {fileID: 0}
panel_predefinedtype: {fileID: 0}
panel_objectinfo: {fileID: 0}
panel_objectalign: {fileID: 0}
agvnodepopup: {fileID: 0}
agvnodemodepopup: {fileID: 0}
panel_tooltip: {fileID: 0}
panel_propertyviewer: {fileID: 0}
panel_draghandler: {fileID: 0}
panel_assetedit: {fileID: 0}
panel_thumbnail: {fileID: 0}
--- !u!114 &545811783
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6175,6 +6229,50 @@ MonoBehaviour:
_name: Orbit
_staticData:
CanHaveMouseButtons: 1
--- !u!1 &850757497
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 850757499}
- component: {fileID: 850757498}
m_Layer: 0
m_Name: StackCranePivot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &850757498
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850757497}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3668196453ca3af4ebb86d3ae290d284, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &850757499
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 850757497}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.24499989, y: 0, z: 4.425}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &880472957
GameObject:
m_ObjectHideFlags: 0
@@ -12295,8 +12393,8 @@ MonoBehaviour:
_transformableLayers: -1
--- !u!4 &1234681447 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
m_PrefabInstance: {fileID: 106299251520811596}
m_CorrespondingSourceObject: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
m_PrefabInstance: {fileID: 3438181655535609399}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1238860481
GameObject:
@@ -15968,6 +16066,115 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1655399330
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1655399334}
- component: {fileID: 1655399333}
- component: {fileID: 1655399332}
- component: {fileID: 1655399331}
m_Layer: 0
m_Name: Plane (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &1655399331
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655399330}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1655399332
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655399330}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: be42061497026f3438d0513fb442e008, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1655399333
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655399330}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1655399334
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655399330}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -5.47, y: 0.01, z: -0.04}
m_LocalScale: {x: 1.6, y: 1, z: 1.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!1 &1656807015
GameObject:
m_ObjectHideFlags: 0
@@ -18352,10 +18559,38 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 172
objectReference: {fileID: 0}
- target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_AnchoredPosition.y
value: -62
objectReference: {fileID: 0}
- target: {fileID: 7320545626431284971, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_Name
value: Panel_AssetEdit
objectReference: {fileID: 0}
- target: {fileID: 7320545626431284971, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7364039931774757102, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_SizeDelta.x
value: 13
objectReference: {fileID: 0}
- target: {fileID: 7364039931774757102, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_SizeDelta.y
value: 13
objectReference: {fileID: 0}
- target: {fileID: 8505836957447598286, guid: fd428f69696481b45a252d4ae922627b, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -20228,63 +20463,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3738577694992196812}
m_CullTransparentMesh: 1
--- !u!1001 &106299251520811596
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1093055756}
m_Modifications:
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 101037460302490810, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7363357197736599361, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
propertyPath: m_Name
value: DataGenerator
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e31a50ed45dd7404a9ff21df4f503810, type: 3}
--- !u!224 &115611047169313263
RectTransform:
m_ObjectHideFlags: 0
@@ -24751,6 +24929,63 @@ MonoBehaviour:
isAlert: 0
m_InputValidator: {fileID: 0}
m_ShouldActivateOnSelect: 1
--- !u!1001 &3438181655535609399
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1093055756}
m_Modifications:
- target: {fileID: 6713041310840835964, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_Name
value: DataGenerator
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6800621539106208743, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fab2f70f3c3e6674eb056102a17bd00b, type: 3}
--- !u!224 &3450176395158740991
RectTransform:
m_ObjectHideFlags: 0
@@ -29364,6 +29599,38 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_AssetProperties
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -29444,6 +29711,78 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -32291,3 +32630,6 @@ SceneRoots:
- {fileID: 216528118}
- {fileID: 481136644}
- {fileID: 1833346089}
- {fileID: 199324788}
- {fileID: 850757499}
- {fileID: 1655399334}

View File

@@ -2446,7 +2446,7 @@ RectTransform:
- {fileID: 1439596647}
- {fileID: 1085911555}
- {fileID: 1712022043}
- {fileID: 1229281891}
- {fileID: 2044724256}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -8179,11 +8179,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fd428f69696481b45a252d4ae922627b, type: 3}
--- !u!224 &1229281891 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8505836957447598286, guid: fd428f69696481b45a252d4ae922627b, type: 3}
m_PrefabInstance: {fileID: 1229281890}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1238860481
GameObject:
m_ObjectHideFlags: 0
@@ -11343,6 +11338,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
currentMode: 0
--- !u!224 &2044724256 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1004720521186896178, guid: fd428f69696481b45a252d4ae922627b, type: 3}
m_PrefabInstance: {fileID: 1229281890}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2057021880
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15784,6 +15784,38 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_AssetProperties
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2248224021015509707, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3869635864744789348, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -15864,6 +15896,78 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6464052319076619291, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7023280984749750221, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7377906147476933673, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822853248451037868, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9196030292009995292, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -16054,10 +16158,42 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1791423234}
m_Modifications:
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1328915120694968705, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1365857456347898781, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_Type
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666387532870275813, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3939186822727609201, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_Name
value: Panel_Toolbar
@@ -16142,6 +16278,118 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6172505290826618417, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7633266742631887865, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7851802935030697533, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7896438446439092586, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8264627921115141145, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8290237631522787461, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693896307265299523, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

View File

@@ -6,6 +6,7 @@ using XED.Manage;
using XED.Command;
using XED.Util;
using XED.Hierarchy;
using XED.VirtualFactory;
using System.Linq;
using UnityEditor;
@@ -120,6 +121,7 @@ namespace XED.Asset
selectRenderObject.Select();
selectedAssetData.AddTransformToRender(selectedItem.transform);
}
public void OnAssetDropped(HierarchyItem item)
{
if (selectedAssetData == null)

View File

@@ -8,7 +8,7 @@ namespace XED.Util
{
public class CustomAssetRenderObject : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
private GameObject renderObject;
public GameObject renderObject;
private MeshRenderer objectRenderer;
private List<Transform> snapPoints = new List<Transform>();
private BoxCollider boxCollider;
@@ -17,7 +17,8 @@ namespace XED.Util
private Material matCubeCollided;
private HashSet<GameObject> objectsInTrigger = new HashSet<GameObject>();
public System.Action onTransformChanged;
public System.Action onTransformChanged;
public Action<GameObject> onRightClicked;
public Func<Bounds> getBounds;
public Func<Transform, GameObject> instantiateObject;
public bool isSelected = false;
@@ -178,6 +179,10 @@ namespace XED.Util
objectRenderer.material = matCubeSelected;
Show();
}
public void RightSelect()
{
onRightClicked?.Invoke(gameObject);
}
public void Deselect()
{
isSelected = false;

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.PerformanceData;
using System.Linq;
using UnityEditor;
using UnityEngine;
@@ -33,6 +34,7 @@ namespace XED.Util
public UnityEvent<List<CustomAssetRenderObject>> onRemoveObject;
public UnityEvent<List<CustomAssetRenderObject>> onCopyObject;
public UnityEvent<List<CustomAssetRenderObject>> onOrderByHierachy;
public event Action<GameObject> onRightSelectObject;
public event System.Action onDeselectAll;
public event System.Action<List<GameObject>> onTransformChanged;
@@ -68,6 +70,7 @@ namespace XED.Util
}
onDragBegin?.Invoke(clickBeginPos);
}
private void OnMousePointerUp()
{
//rtg 컨트롤러가 조작중일때 락을 건다.
@@ -151,6 +154,45 @@ namespace XED.Util
}
onDragForceEnd?.Invoke();
}
private void OnRightMousePointerDown()
{
PointerEventData pointerData = new PointerEventData(EventSystem.current)
{
position = Input.mousePosition
};
List<RaycastResult> raycastResults = new List<RaycastResult>();
EventSystem.current.RaycastAll(pointerData, raycastResults);
if (raycastResults.Any(x => x.gameObject.layer == uiLayer))
{
return;
}
List<CustomAssetRenderObject> raycastedTarget = new List<CustomAssetRenderObject>();
CustomAssetRenderObject renderObject = null;
foreach (var result in raycastResults)
{
renderObject = result.gameObject.GetComponent<CustomAssetRenderObject>();
if (renderObject != null)
{
raycastedTarget.Add(renderObject);
}
}
if (raycastedTarget.Count > 0)
{
//오브젝트가 여러개 겹쳐 있을 경우 뒤의 오브젝트를 순차적으로 선택해주기 위한 용도
if (selectIndex < raycastedTarget.Count)
{
selectIndex++;
}
if (selectIndex >= raycastedTarget.Count)
{
selectIndex = 0;
}
renderObject = raycastedTarget[selectIndex];
onRightSelectObject?.Invoke(renderObject.gameObject);
}
}
public void DeselectAll()
{
if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftShift))
@@ -426,6 +468,7 @@ namespace XED.Util
var upKeyActions = new Dictionary<KeyCode, Action>();
downKeyActions.Add(KeyCode.Mouse0, OnMousePointerDown);
downKeyActions.Add(KeyCode.Mouse1, OnRightMousePointerDown);
upKeyActions.Add(KeyCode.Mouse0, OnMousePointerUp);
getKeyActions.Add(KeyCode.Q, SetRTGMove);
getKeyActions.Add(KeyCode.W, SetRTGRotate);

View File

@@ -7,24 +7,24 @@ namespace XED.VirtualFactory
[Serializable]
public class AMR_Class
{
public string type;
public string AmrId;
public int workstate;
public string type="";
public string AmrId="";
public int workstate=0;
public float moveSpeed;
public Pose Pose;
public Pose Pose=new Pose();
public int lift_;
public int loaded;
public string Cmd;
public int lift_=0;
public int loaded=0;
public string Cmd="";
}
[Serializable]
public class Pose
{
public float x;
public float y;
public float theta;
public float x=0;
public float y=0;
public float theta=0;
}
[Serializable]

View File

@@ -16,9 +16,9 @@ namespace XED.VirtualFactory
public event Action<string,COBOT_Class> onCobotDataReceived;
public event Action<string,AMR_Class> onAMRDataReceived;
void Start()
public override void AfterAwake()
{
FindObjectOfType<DataReader>().onMessageReceived += DataDistribute;
FindAnyObjectByType<DataReader>().onMessageReceived += DataDistribute;
}
public void DataDistribute(string topic, string data)
@@ -67,18 +67,70 @@ namespace XED.VirtualFactory
onCobotDataReceived?.Invoke(topic, cobot);
break;
case "R_137.ACS":
if (data.Contains("battery"))
{
return;
}
if (!data.Contains("wia1000") && !data.Contains("wia300"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
if (!string.Equals(amr.Cmd, "basic"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
onAMRDataReceived?.Invoke(topic, amr);
break;
case "R_147.ACS":
if (data.Contains("battery"))
{
return;
}
if (!data.Contains("wia1000") && !data.Contains("wia300"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
if (!string.Equals(amr.Cmd, "basic"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
onAMRDataReceived?.Invoke(topic, amr);
break;
case "R_153.ACS":
if (data.Contains("battery"))
{
return;
}
if (!data.Contains("wia1000") && !data.Contains("wia300"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
if (!string.Equals(amr.Cmd, "basic"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
onAMRDataReceived?.Invoke(topic, amr);
break;
case "R_156.ACS":
if (data.Contains("battery"))
{
return;
}
if (!data.Contains("wia1000") && !data.Contains("wia300"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
if (!string.Equals(amr.Cmd, "basic"))
{
return;
}
amr = JsonConvert.DeserializeObject<AMR_Class>(data);
onAMRDataReceived?.Invoke(topic, amr);
break;

View File

@@ -45,9 +45,11 @@ public class DataReader : MonoBehaviour
if (csvFile != null)
{
//Debug.Log($"DataArchitect: {csvFile.text}");
StartCoroutine(GenerateDataFromCSV(csvFile.text,parseTime(PlayerPrefs.GetInt("Minute"),PlayerPrefs.GetInt("Second"))));
//StartCoroutine(GenerateDataFromCSV(csvFile.text,parseTime(PlayerPrefs.GetInt("Minute"),PlayerPrefs.GetInt("Second"))));
ReadData(csvFile.text);
PlayerPrefs.SetInt("Minute", 0);
PlayerPrefs.SetInt("Second", 0);
Time.timeScale *= 2;
}
else
{
@@ -55,6 +57,7 @@ public class DataReader : MonoBehaviour
}
}
public void SetTimer(int minute,int second)
{
PlayerPrefs.SetInt("Minute", minute);
@@ -66,6 +69,11 @@ public class DataReader : MonoBehaviour
return new TimeSpan(0, 0, minute, second, 0);
}
public void StartDistribute()
{
StartCoroutine(GenerateDataFromCSV(csvFile.text, parseTime(PlayerPrefs.GetInt("Minute"), PlayerPrefs.GetInt("Second"))));
}
IEnumerator GenerateDataFromCSV(string csvContent,TimeSpan startTime)
{
prevTime = new TimeSpan();
@@ -97,6 +105,16 @@ public class DataReader : MonoBehaviour
onMessageReceived?.Invoke(datas[1], datas[2]);
prevTime = nowTime;
}
SceneManager.LoadScene(0);
}
void ReadData(string csvContent)
{
string[] lines = csvContent.Split(new string[] { "\n", "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
datas = line.Split(separator);
onMessageReceived?.Invoke(datas[1], datas[2]);
}
}
}

View File

@@ -32,6 +32,7 @@ namespace XED.Manage
var customAssetConnector = FindSingle<CustomAssetConnector>();
var renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>();
var projectManager = FindSingle<ProjectManager>();
var dataReader = FindAnyObjectByType<DataReader>();
GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject;
SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData;
@@ -95,6 +96,8 @@ namespace XED.Manage
canvas_static.panel_topbar.onClickLoadAssets += saveLoadFBXData.LoadLocalFBXDirectory;
canvas_static.panel_topbar.onClickAssetWindow += (() => assetWindow.SetActive(!assetWindow.activeSelf));
canvas_static.panel_topbar.onClickComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
canvas_static.panel_topbar.onClickComponentWindow += (() => componentWindow.SetActive(!componentWindow.activeSelf));
canvas_static.panel_topbar.onClickPlay += dataReader.StartDistribute;
//Panel Toolbar
canvas_static.panel_toolbar.onClickMove += renderObjectHandler.SetRTGMove;

View File

@@ -22,7 +22,17 @@ namespace XED.VirtualFactory
Dictionary<string, Supplier_Breaked_Class> supplierDict = new Dictionary<string, Supplier_Breaked_Class>();
Dictionary<string, COBOT_Class> cobotDict = new Dictionary<string, COBOT_Class>();
public event Action<List<(string, string)>,string> onUISelected;
public event Action<List<(string, string)>, string> onDataSelected;
public event Action<List<(string, string)>,string> onDataUpdated;
#region
public event Action<string, AMR_Class> prototype_AMREvent;
public event Action<string, ASRS_Lifter_Breaked_Class> prototype_LifterEvent;
public event Action<string, ASRS_StackerCrane_Class> prototype_StackerEvent;
public event Action<string, ASRS_Class> prototype_AsrsEvent;
public event Action<string, Supplier_Breaked_Class> prototype_SupplierEvent;
public event Action<string, COBOT_Class> prototype_CobotEvent;
#endregion
public override void AfterAwake()
{
@@ -34,7 +44,12 @@ namespace XED.VirtualFactory
datadistributer.onSupplierDataReceived += LinkDataUI_Supplier;
datadistributer.onCobotDataReceived += LinkDataUI_Cobot;
prf_LinkDataUI = Resources.Load<UI_LinkData>($"Prefabs/UI/{nameof(prf_LinkDataUI)}");
var ui = Instantiate(prf_LinkDataUI, body);
ui.SetUI("none");
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add("none", ui);
}
// Start is called once before the first execution of Update after the MonoBehaviour is created
void LinkDataUI_AMR(string topic, AMR_Class data)
{
@@ -45,10 +60,13 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(topic, ui);
amrDict.Add(topic, data);
prototype_AMREvent?.Invoke(topic, data);
}
else
{
amrDict[topic] = data;
onDataUpdated?.Invoke(PrintAllVariables(amrDict[topic]), topic);
prototype_AMREvent?.Invoke(topic, data);
}
}
@@ -77,10 +95,14 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(nameof(asrs_04_01), ui);
lifterDict.Add(nameof(asrs_04_01), asrs_04_01);
onDataUpdated?.Invoke(PrintAllVariables(lifterDict[nameof(asrs_04_01)]), nameof(asrs_04_01));
prototype_LifterEvent?.Invoke(nameof(asrs_04_01), lifterDict[nameof(asrs_04_01)]);
}
else
{
lifterDict[nameof(asrs_04_01)]= asrs_04_01;
onDataUpdated?.Invoke(PrintAllVariables(lifterDict[nameof(asrs_04_01)]), nameof(asrs_04_01));
prototype_LifterEvent?.Invoke(nameof(asrs_04_01), lifterDict[nameof(asrs_04_01)]);
}
if (!linkDataDict.ContainsKey(nameof(asrs_14_01)))
@@ -90,10 +112,14 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(nameof(asrs_14_01), ui);
lifterDict.Add(nameof(asrs_14_01), asrs_14_01);
onDataUpdated?.Invoke(PrintAllVariables(lifterDict[nameof(asrs_14_01)]), nameof(asrs_14_01));
prototype_LifterEvent?.Invoke(nameof(asrs_14_01), lifterDict[nameof(asrs_14_01)]);
}
else
{
lifterDict[nameof(asrs_14_01)] = asrs_14_01;
onDataUpdated?.Invoke(PrintAllVariables(lifterDict[nameof(asrs_14_01)]), nameof(asrs_14_01));
prototype_LifterEvent?.Invoke(nameof(asrs_14_01), lifterDict[nameof(asrs_14_01)]);
}
}
@@ -106,10 +132,13 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(topic, ui);
stackerDict.Add(topic, data);
prototype_StackerEvent?.Invoke(topic, data);
}
else
{
stackerDict[topic] = data;
onDataUpdated?.Invoke(PrintAllVariables(stackerDict[topic]), topic);
prototype_StackerEvent?.Invoke(topic, data);
}
}
@@ -122,10 +151,13 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(topic, ui);
asrsDict.Add(topic, data);
prototype_AsrsEvent?.Invoke(topic, data);
}
else
{
asrsDict[topic] = data;
onDataUpdated?.Invoke(PrintAllVariables(asrsDict[topic]), topic);
prototype_AsrsEvent?.Invoke(topic, data);
}
}
@@ -153,10 +185,13 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(nameof(Supplier_06_01), ui);
supplierDict.Add(nameof(Supplier_06_01), Supplier_06_01);
prototype_SupplierEvent(nameof(Supplier_06_01), Supplier_06_01);
}
else
{
supplierDict[nameof(Supplier_06_01)] = Supplier_06_01;
onDataUpdated?.Invoke(PrintAllVariables(supplierDict[nameof(Supplier_06_01)]), nameof(Supplier_06_01));
prototype_SupplierEvent(nameof(Supplier_06_01), Supplier_06_01);
}
if (!linkDataDict.ContainsKey(nameof(Supplier_06_02)))
@@ -166,10 +201,13 @@ namespace XED.VirtualFactory
ui.onUIClicked += findDictionaryByUI;
linkDataDict.Add(nameof(Supplier_06_02), ui);
supplierDict.Add(nameof(Supplier_06_02), Supplier_06_02);
prototype_SupplierEvent(nameof(Supplier_06_02), Supplier_06_02);
}
else
{
supplierDict[nameof(Supplier_06_02)] = Supplier_06_02;
onDataUpdated?.Invoke(PrintAllVariables(supplierDict[nameof(Supplier_06_02)]), nameof(Supplier_06_02));
prototype_SupplierEvent(nameof(Supplier_06_02), Supplier_06_02);
}
if (!linkDataDict.ContainsKey(nameof(Supplier_06_03)))
@@ -183,6 +221,8 @@ namespace XED.VirtualFactory
else
{
supplierDict[nameof(Supplier_06_03)] = Supplier_06_03;
onDataUpdated?.Invoke(PrintAllVariables(supplierDict[nameof(Supplier_06_03)]), nameof(Supplier_06_03));
prototype_SupplierEvent(nameof(Supplier_06_03), Supplier_06_03);
}
}
@@ -199,6 +239,7 @@ namespace XED.VirtualFactory
else
{
cobotDict[topic] = data;
onDataUpdated?.Invoke(PrintAllVariables(cobotDict[topic]), topic);
}
}
@@ -207,27 +248,32 @@ namespace XED.VirtualFactory
var myKey = linkDataDict.FirstOrDefault(x => x.Value == UI).Key;
if (amrDict.ContainsKey(myKey))
{
onUISelected?.Invoke(PrintAllVariables(amrDict[myKey]),myKey);
onDataSelected?.Invoke(PrintAllVariables(amrDict[myKey]),myKey);
}
else if (lifterDict.ContainsKey(myKey))
{
onUISelected?.Invoke(PrintAllVariables(lifterDict[myKey]), myKey);
onDataSelected?.Invoke(PrintAllVariables(lifterDict[myKey]), myKey);
}
else if (stackerDict.ContainsKey(myKey))
{
onUISelected?.Invoke(PrintAllVariables(stackerDict[myKey]), myKey);
onDataSelected?.Invoke(PrintAllVariables(stackerDict[myKey]), myKey);
}
else if (asrsDict.ContainsKey(myKey))
{
onUISelected?.Invoke(PrintAllVariables(asrsDict[myKey]), myKey);
onDataSelected?.Invoke(PrintAllVariables(asrsDict[myKey]), myKey);
}
else if (supplierDict.ContainsKey(myKey))
{
onUISelected?.Invoke(PrintAllVariables(supplierDict[myKey]), myKey);
onDataSelected?.Invoke(PrintAllVariables(supplierDict[myKey]), myKey);
}
else if (cobotDict.ContainsKey(myKey))
{
onUISelected?.Invoke(PrintAllVariables(cobotDict[myKey]), myKey);
onDataSelected?.Invoke(PrintAllVariables(cobotDict[myKey]), myKey);
}
else
{
List<(string, string)> v = new List<(string, string)>();
onDataSelected?.Invoke(v, "none");
}
}
@@ -237,10 +283,18 @@ namespace XED.VirtualFactory
Type type = target.GetType();
FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
FieldInfo[] fields = type.GetFields(BindingFlags.Instance |BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Static);
foreach (FieldInfo field in fields)
{
var value = field.GetValue(target).ToString();
string value;
try
{
value = field.GetValue(target).ToString();
}
catch
{
value = "";
}
var tuple = (field.Name, value);
variableList.Add(tuple);
}

View File

@@ -8,6 +8,7 @@ namespace XED.UI
{
public TMP_Text Title;
public TMP_Text Label;
public string title;
public Image Marker;
public override void AfterAwake()
@@ -19,7 +20,21 @@ namespace XED.UI
public void SetUI(string title,string label)
{
Title.text = title;
this.title = title;
Label.text = label;
}
public bool SetUIByLabel(string title, string label)
{
if (this.title == title)
{
Label.text = label;
return true;
}
else
{
return false;
}
}
}
}

View File

@@ -12,34 +12,62 @@ namespace XED.UI
public TMP_Text AssetLabel;
public TMP_Text ConnectedAssetLabel;
public Button ConnectedAssetMarker;
public Button Button_Close;
public RectTransform Background;
public RectTransform Body;
public RectTransform ScrollView;
public List<UI_AssetEdit> UIList = new List<UI_AssetEdit>();
float defaulty=88f;
public Dictionary<string, List<(string, string)>> topicDict = new Dictionary<string, List<(string, string)>>();
public string topic;
float defaulty = 88f;
[SerializeField]
float maxSize=600f;
public float bottomPadding = 30f;
[SerializeField]
UI_AssetEdit prf_AssetEditUI;
RectTransform rect;
public Panel_InterworkingDataList datalist;
public override void AfterAwake()
{
rect = gameObject.GetComponent<RectTransform>();
AssetLabel = Find<TMP_Text>(nameof(AssetLabel));
ConnectedAssetLabel = Find<TMP_Text>(nameof(ConnectedAssetLabel));
ConnectedAssetMarker = Find<Button>(nameof(ConnectedAssetMarker));
Background = Find<RectTransform>(nameof(Background));
Body = Find<RectTransform>(nameof(Body));
defaulty = Background.sizeDelta.y;
Button_Close = Find<Button>(nameof(Button_Close));
datalist = FindAnyObjectByType<Panel_InterworkingDataList>(FindObjectsInactive.Include);
ConnectedAssetMarker.onClick.AddListener(() => datalist.SetActive(true));
FindAnyObjectByType<LinkDataUIManager>(FindObjectsInactive.Include).onUISelected += SetAssetData;
Button_Close.onClick.AddListener(() => gameObject.SetActive(false));
Background = Find<RectTransform>(nameof(Background));
Body = Find<RectTransform>(nameof(Body));
ScrollView = Find<RectTransform>(nameof(ScrollView));
defaulty = rect.sizeDelta.y;
FindAnyObjectByType<LinkDataUIManager>(FindObjectsInactive.Include).onDataSelected += SetAssetData;
FindAnyObjectByType<LinkDataUIManager>(FindObjectsInactive.Include).onDataUpdated += UpdateAssetData;
}
public void SetAssetData(List<(string,string)> datas,string topic)
public void SetObject(string topic)
{
foreach(var ui in UIList)
if (topicDict.ContainsKey(topic))
{
SetAssetData(topicDict[topic], topic);
}
else
{
foreach (var ui in UIList)
{
Destroy(ui.gameObject);
}
UIList.Clear();
SetBackgroundSize();
ConnectedAssetLabel.text = "Data D(Key)";
}
}
public void SetAssetData(List<(string, string)> datas, string topic)
{
foreach (var ui in UIList)
{
Destroy(ui.gameObject);
}
@@ -52,12 +80,51 @@ namespace XED.UI
UIList.Add(AssetEdit);
SetBackgroundSize();
}
this.topic = topic;
if (!topicDict.ContainsKey(topic))
{
topicDict.Add(topic, datas);
}
}
public void UpdateAssetData(List<(string, string)> datas, string topic)
{
if (this.topic == topic)
{
foreach (var d in datas)
{
foreach (var ui in UIList)
{
if (ui.SetUIByLabel(d.Item1, d.Item2))
{
break;
}
}
}
}
}
public void ConnectLabelToObject()
{
}
void SetBackgroundSize()
{
var yalpha = prf_AssetEditUI.GetComponent<RectTransform>().sizeDelta.y + Body.GetComponent<VerticalLayoutGroup>().spacing;
Background.sizeDelta = new Vector2(Background.sizeDelta.x, defaulty + yalpha * UIList.Count + bottomPadding);
float y = defaulty + yalpha * UIList.Count + bottomPadding;
if (y < maxSize)
{
rect.sizeDelta = new Vector2(rect.sizeDelta.x, y);
ScrollView.sizeDelta=new Vector2(ScrollView.sizeDelta.x, 39 + yalpha * UIList.Count + bottomPadding);
Body.sizeDelta = new Vector2(Body.sizeDelta.x, 39 + yalpha * UIList.Count + bottomPadding);
}
else
{
rect.sizeDelta = new Vector2(rect.sizeDelta.x, maxSize);
ScrollView.sizeDelta=new Vector2(ScrollView.sizeDelta.x, maxSize-75f);
Body.sizeDelta= new Vector2(Body.sizeDelta.x, 39 + yalpha * UIList.Count + bottomPadding);
}
}
}
}

View File

@@ -16,6 +16,7 @@ namespace XED.UI
public Button Button_HierarchyWindow;
public Button Button_Tools;
public Button button_Icon;
public Button Button_Play;
public event Action onClickNewProject;
public event Action onClickSaveProject;
@@ -28,6 +29,8 @@ namespace XED.UI
public event Action onClickComponentWindow;
public event Action onClickTools;
public event Action onClickIcon;
public event Action onClickPlay;
public override void AfterAwake()
{
Button_NewProject.onClick.AddListener(OnClickNewProject);
@@ -41,6 +44,7 @@ namespace XED.UI
Button_HierarchyWindow.onClick.AddListener(OnClickHierarchyWindow);
Button_Tools.onClick.AddListener(OnClickTools);
button_Icon.onClick.AddListener(OnClickIcon);
Button_Play.onClick.AddListener(OnClickPlay);
}
void OnClickIcon()
@@ -87,5 +91,10 @@ namespace XED.UI
{
onClickTools?.Invoke();
}
void OnClickPlay()
{
onClickPlay?.Invoke();
}
}
}

Binary file not shown.

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5e1e76a4d15377740ac8b283d2611037
guid: 38bb3d829256d8c4eae06c55b4bbbb3a
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 5779789875879608344
- rid: 5779789875879608345
- rid: 7094863295715475528
- rid: 7094863295715475529
- rid: 4833515143083327490
- rid: 5779789875879608346
- rid: 7094863295715475530
- rid: 4833515143083327492
- rid: 5779789875879608347
- rid: 7094863295715475531
- rid: 4833515143083327494
- rid: 4833515143083327495
- rid: 4833515143083327496
- rid: 4833515143083327497
- rid: 5779789875879608348
- rid: 7094863295715475532
- rid: 4833515143083327499
- rid: 5779789875879608349
- rid: 7094863295715475533
- rid: 4833515143083327501
- rid: 5779789875879608350
- rid: 5779789875879608351
- rid: 5779789875879608352
- rid: 7094863295715475534
- rid: 7094863295715475535
- rid: 7094863295715475536
- rid: 4833515143083327505
- rid: 5779789875879608353
- rid: 5779789875879608354
- rid: 7094863295715475537
- rid: 7094863295715475538
- rid: 4833515143083327508
- rid: 5779789875879608355
- rid: 7094863295715475539
m_RuntimeSettings:
m_List:
- rid: 4833515143083327490
@@ -154,7 +154,7 @@ MonoBehaviour:
m_ExportShaderVariants: 1
m_ShaderVariantLogLevel: 0
m_StripRuntimeDebugShaders: 1
- rid: 5779789875879608344
- rid: 7094863295715475528
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -163,7 +163,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 5779789875879608345
- rid: 7094863295715475529
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -175,7 +175,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 5779789875879608346
- rid: 7094863295715475530
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@@ -190,18 +190,18 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 5779789875879608347
- rid: 7094863295715475531
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 5779789875879608348
- rid: 7094863295715475532
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 5779789875879608349
- rid: 7094863295715475533
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@@ -214,21 +214,21 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 5779789875879608350
- rid: 7094863295715475534
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 5779789875879608351
- rid: 7094863295715475535
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 5779789875879608352
- rid: 7094863295715475536
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -241,7 +241,7 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 5779789875879608353
- rid: 7094863295715475537
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -251,12 +251,12 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 5779789875879608354
- rid: 7094863295715475538
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 5779789875879608355
- rid: 7094863295715475539
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}

View File

@@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/0.17.5.unity
guid: cc941d4f14d41b041b46185232e3d04b
path: Assets/Scenes/0.22.7.unity
guid: 601137f5afc06594eb58cc68bb03ed55
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 0e9579a90d161f540a9047e131bc3996, type: 2}
com.unity.localization.settings: {fileID: 11400000, guid: d783f8b1535e6be489d55740adbafda0, type: 2}

View File

@@ -1 +1 @@
8407fa8759b6c712c33e41273b5bfce4
62d50a6ea868ec226486b3f3a63e16cf