commit
This commit is contained in:
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
BIN
Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png
Normal file
BIN
Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.8 KiB |
130
Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png.meta
Normal file
130
Assets/Prefabs/LibaryPrefab_Legacy/Queue_pallet.png.meta
Normal file
@@ -0,0 +1,130 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d183ffb0b3b0cf5438f37bd020a73be7
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -168,9 +168,9 @@ RectTransform:
|
||||
- {fileID: 5292512457043580520}
|
||||
m_Father: {fileID: 4984763691913443583}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 574, y: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -386, y: 0}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2098207759045039967
|
||||
@@ -185,8 +185,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 1ea6a631f762ef04192456d9b727b870, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
playing: {fileID: 21300000, guid: 338405d6332a3db4b8d80383044bb882, type: 3}
|
||||
pause: {fileID: 21300000, guid: f8465c3df32cf1941889a4455097d8c7, type: 3}
|
||||
playing: {fileID: 21300000, guid: 7eeb96551b314474a9f71ba2aa86b0fe, type: 3}
|
||||
pause: {fileID: 21300000, guid: 338405d6332a3db4b8d80383044bb882, type: 3}
|
||||
isplaying: 0
|
||||
--- !u!1 &1484343671791922000
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -594,9 +595,9 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4984763691913443583}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -895, y: -5}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 65, y: -5}
|
||||
m_SizeDelta: {x: 53, y: 47}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4943627641902797860
|
||||
@@ -1144,9 +1145,9 @@ RectTransform:
|
||||
- {fileID: 2387822035400023919}
|
||||
m_Father: {fileID: 4984763691913443583}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -700, y: -6}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 260, y: -6}
|
||||
m_SizeDelta: {x: 280, y: 32}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7323262126195169850
|
||||
@@ -1768,7 +1769,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@@ -1776,7 +1777,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
@@ -1820,7 +1821,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 341.1
|
||||
value: -618.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
@@ -1898,10 +1899,30 @@ PrefabInstance:
|
||||
- {fileID: 5988394804144119520, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 6058415533521999480, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6570108898223279542}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
--- !u!224 &1425895631360000977 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3503810027013440615, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
m_PrefabInstance: {fileID: 2551786316159780790}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8609216685609685454 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6058415533521999480, guid: 3339d7a79f1d64748b39a258f666cfe3, type: 3}
|
||||
m_PrefabInstance: {fileID: 2551786316159780790}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6570108898223279542
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8609216685609685454}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4532cb1d47b03e243b7e5def77071685, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
|
||||
@@ -57,7 +57,7 @@ Transform:
|
||||
m_GameObject: {fileID: 8186549463259896341}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -2.27, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@@ -111,8 +111,10 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
modelName: Machine
|
||||
modelType: 4
|
||||
prefabName:
|
||||
modelID:
|
||||
nodeID:
|
||||
eventKey:
|
||||
eventUsingQueue: processor_using_queue
|
||||
eventUsingStore: processor_using_store
|
||||
eventStartBatch: processor_batch_started
|
||||
@@ -149,6 +151,7 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
resource: {fileID: 0}
|
||||
--- !u!1001 &8546186986686672160
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -197,12 +200,22 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7995712223807787156, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 0e3f0b7dec0089c42899f516d86b22a0, type: 2}
|
||||
- target: {fileID: -7688954262792016975, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3}
|
||||
propertyPath: 'm_Materials.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 0e3f0b7dec0089c42899f516d86b22a0, type: 2}
|
||||
- target: {fileID: 919132149155446097, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Machine
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 4742473837712756890, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 5658468373451844476, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2fe45f825af66d14cbb13cdadbc5f837, type: 3}
|
||||
|
||||
176
Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab
Normal file
176
Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab
Normal file
@@ -0,0 +1,176 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2533144741472733039
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3518951519622711998}
|
||||
m_Layer: 0
|
||||
m_Name: ProductPosition
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3518951519622711998
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2533144741472733039}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8919246687821753581}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2693674306982507605
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8919246687821753581}
|
||||
- component: {fileID: 1166314466484888031}
|
||||
m_Layer: 0
|
||||
m_Name: Queue_pallet
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8919246687821753581
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2693674306982507605}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8106578039535807440}
|
||||
- {fileID: 3518951519622711998}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1166314466484888031
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2693674306982507605}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d28be1f710820ac488733195726ded56, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
modelName: QPallet
|
||||
modelType: 3
|
||||
modelID:
|
||||
nodeID:
|
||||
eventKey:
|
||||
storePositions:
|
||||
- {fileID: 3518951519622711998}
|
||||
maxCapacity: 0
|
||||
storedProducts: []
|
||||
storeType: fifo
|
||||
transporterPositions: []
|
||||
--- !u!1 &2884442297077190549
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8106578039535807440}
|
||||
- component: {fileID: 5933223697274662716}
|
||||
- component: {fileID: 1315126460507660351}
|
||||
m_Layer: 0
|
||||
m_Name: pallet.014
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8106578039535807440
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2884442297077190549}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.5, y: -0.49999997, z: -0.5, w: -0.5}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 30.000002, y: 30.000002, z: 30.000002}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8919246687821753581}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &5933223697274662716
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2884442297077190549}
|
||||
m_Mesh: {fileID: 1747777963612955146, guid: 14931c3c24ab76e4ea8fbc2a5c5cf1a1, type: 3}
|
||||
--- !u!23 &1315126460507660351
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2884442297077190549}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 9b21d3f728af4854394ee4b667a96bab, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 07b091bc31bf61b43ba579a9c9baa7f0
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,37 +1,5 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &6559360343920525660
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7374929338666446432}
|
||||
m_Layer: 0
|
||||
m_Name: Models
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7374929338666446432
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6559360343920525660}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6052881152895185930}
|
||||
m_Father: {fileID: 6733763396490065076}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8981091474273742600
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -62,7 +30,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7374929338666446432}
|
||||
- {fileID: 6052881152895185930}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3778496298057829303
|
||||
@@ -98,7 +66,7 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7374929338666446432}
|
||||
m_TransformParent: {fileID: 6733763396490065076}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5825089394656910413, guid: 71cb5b14e9e72d047acd0f48e86dbccc, type: 3}
|
||||
propertyPath: m_Name
|
||||
|
||||
@@ -384,7 +384,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
modelName: Rack(NoCrane)
|
||||
modelType: 0
|
||||
modelType: 5
|
||||
modelID:
|
||||
nodeID:
|
||||
eventKey:
|
||||
|
||||
BIN
Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png
Normal file
BIN
Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
130
Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png.meta
Normal file
130
Assets/Resources/Library/LibraryThumbnails/Queue_pallet.png.meta
Normal file
@@ -0,0 +1,130 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 91769bc1ad6c7bb4396ae3e1ec63ed11
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -2,8 +2,10 @@
|
||||
"configs": [
|
||||
{
|
||||
"name": "main",
|
||||
"host": "220.90.135.42",
|
||||
"port": 3016
|
||||
//"host": "220.90.135.42",
|
||||
"host": "simulator.flexing.ai",
|
||||
//"port": 3016,
|
||||
"port": 8089
|
||||
//"host": "localhost",
|
||||
//"port": 9001
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
rectTransform: {fileID: 0}
|
||||
prefabToSpawn: {fileID: 0}
|
||||
mask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 64
|
||||
targetModel: {fileID: 0}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"configs": [
|
||||
{
|
||||
"host": "http://220.90.135.42",
|
||||
"host": "https://simulator.flexing.ai/server",
|
||||
//"port": 3000,
|
||||
"port": 3037,
|
||||
"accessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcmlkIjoic3lzdGVtIiwibmFtZSI6IuyLnOyKpO2FnOq0gOumrOyekCIsImF1dGgiOiJzeXN0ZW0iLCJjb21wYW55SWQiOm51bGwsImlhdCI6MTczNTYwOTgyOCwiZXhwIjoxNzcxNjA5ODI4fQ.ApXLL_RsWWaa2KwRKrg1z8iT9MNYdZFqN-6Mn1Lvq8Q"
|
||||
|
||||
@@ -3943,6 +3943,17 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 280530796}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &333326510 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
m_PrefabInstance: {fileID: 1978124149882810898}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &335469059
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4176,8 +4187,8 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 1900070398}
|
||||
m_HandleRect: {fileID: 1900070397}
|
||||
m_Direction: 0
|
||||
m_Value: -0.0000080781965
|
||||
m_Size: 0.9492538
|
||||
m_Value: 0
|
||||
m_Size: 0.94925374
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
@@ -4688,23 +4699,6 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &654623204 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2069922514250663687, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
m_PrefabInstance: {fileID: 594906197750746389}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &654623208
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 654623204}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0b14edf47f496e743bbd0c912036fc12, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &801042363
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5778,7 +5772,7 @@ MonoBehaviour:
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||
m_ScreenMatchMode: 0
|
||||
m_ScreenMatchMode: 1
|
||||
m_MatchWidthOrHeight: 1
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
@@ -6043,9 +6037,9 @@ RectTransform:
|
||||
- {fileID: 2311924330207727106}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 478.4, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!224 &367185471565543009
|
||||
@@ -6092,6 +6086,10 @@ PrefabInstance:
|
||||
propertyPath: projectMenuButton
|
||||
value:
|
||||
objectReference: {fileID: 205755441}
|
||||
- target: {fileID: 3408166986665272114, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
propertyPath: projectSaveButton
|
||||
value:
|
||||
objectReference: {fileID: 333326510}
|
||||
- target: {fileID: 5366961481726599031, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.2462957
|
||||
@@ -6135,10 +6133,7 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 2069922514250663687, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 654623208}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6c1ed824d30fe8848957d865919227a0, type: 3}
|
||||
--- !u!224 &683822271461456720
|
||||
RectTransform:
|
||||
@@ -6225,9 +6220,9 @@ RectTransform:
|
||||
- {fileID: 6499542618443802032}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 268.27, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &845759495562603487
|
||||
@@ -6302,9 +6297,9 @@ RectTransform:
|
||||
- {fileID: 683822271461456720}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 96.3, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 133, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1139653803094619106
|
||||
@@ -6462,9 +6457,9 @@ RectTransform:
|
||||
- {fileID: 4404546396223628744}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 548.5, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1373440720316733049
|
||||
@@ -6624,14 +6619,14 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 22
|
||||
m_Right: 0
|
||||
m_Left: 44
|
||||
m_Right: 44
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_Spacing: 22
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildAlignment: 3
|
||||
m_Spacing: 44
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
@@ -6755,10 +6750,30 @@ PrefabInstance:
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 2104988513}
|
||||
- target: {fileID: 855212757162085532, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1484343671791922000, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: projectSaveButton
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2384442433823687998, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 1251266450}
|
||||
- target: {fileID: 2387822035400023919, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2387822035400023919, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -34
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3240717536119192961, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3913561980990034504, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
@@ -6855,6 +6870,10 @@ PrefabInstance:
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 2104988513}
|
||||
- target: {fileID: 7723225891300246667, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8899784082918223576, guid: 91b280356e2a9674aac91102f2da87f8, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
@@ -7350,9 +7369,9 @@ RectTransform:
|
||||
- {fileID: 4009499115963812234}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 618.2, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3282056040016605463
|
||||
@@ -7956,9 +7975,9 @@ RectTransform:
|
||||
m_Father: {fileID: 7027186561456478243}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1920, y: 1080}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -150, y: 0}
|
||||
m_SizeDelta: {x: -360, y: 280}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5268278286338153298
|
||||
GameObject:
|
||||
@@ -7970,6 +7989,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 5239015192560940965}
|
||||
- component: {fileID: 7653034342743801325}
|
||||
- component: {fileID: 7653034342743801326}
|
||||
m_Layer: 5
|
||||
m_Name: ObjectLibraryTabs
|
||||
m_TagString: Untagged
|
||||
@@ -7993,9 +8013,9 @@ RectTransform:
|
||||
- {fileID: 4149779453014247578}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 408.2, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5427388964421026539
|
||||
@@ -8426,7 +8446,7 @@ MonoBehaviour:
|
||||
m_HandleRect: {fileID: 1792930014543576916}
|
||||
m_Direction: 2
|
||||
m_Value: 0
|
||||
m_Size: 0.9999999
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
@@ -8650,7 +8670,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -1015.9637
|
||||
value: -1081.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
@@ -9108,10 +9128,10 @@ RectTransform:
|
||||
- {fileID: 6023202728124299781}
|
||||
m_Father: {fileID: 1916153470}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1920, y: 1080}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7062256588867111173
|
||||
MonoBehaviour:
|
||||
@@ -9181,6 +9201,32 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_AllowSwitchOff: 0
|
||||
--- !u!114 &7653034342743801326
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5268278286338153298}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &7700752512093214595
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -9216,9 +9262,9 @@ RectTransform:
|
||||
- {fileID: 5905741446358991365}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 198.3, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7993663837510565849
|
||||
@@ -9299,9 +9345,9 @@ RectTransform:
|
||||
- {fileID: 6137159009526871422}
|
||||
m_Father: {fileID: 5239015192560940965}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 338.6, y: 120}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 71, y: 41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8236052657312982086
|
||||
|
||||
@@ -49,6 +49,7 @@ public class ClickHandler : MonoBehaviour
|
||||
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
|
||||
if (Physics.Raycast(ray, out RaycastHit hit))
|
||||
{
|
||||
Debug.Log(hit.transform.name);
|
||||
if (hit.collider.TryGetComponent<IClickable>(out var clickable))
|
||||
{
|
||||
highLight.ShowHighlight((BoxCollider)hit.collider);
|
||||
|
||||
@@ -13,17 +13,36 @@ public class DataManager : UnitySingleton<DataManager>
|
||||
public void AddModel(SimulationModel model)
|
||||
{
|
||||
if (models.Any(x => x == model))
|
||||
return;
|
||||
int objCount = models.FindAll(x => x.modelName.Contains(model.modelName)).Count;
|
||||
model.modelName = model.modelName + "_" + objCount.ToString();
|
||||
return;
|
||||
string baseName = model.modelName;
|
||||
if (string.IsNullOrEmpty(model.objectName))
|
||||
{
|
||||
var existingIndices = models
|
||||
.Where(x => x.objectName.StartsWith(baseName + "_"))
|
||||
.Select(x =>
|
||||
{
|
||||
var parts = x.objectName.Split('_');
|
||||
int idx;
|
||||
return (parts.Length > 1 && int.TryParse(parts.Last(), out idx)) ? idx : 0;
|
||||
});
|
||||
|
||||
int nextIndex = existingIndices.Any() ? existingIndices.Max() + 1 : 0;
|
||||
|
||||
model.objectName = $"{baseName}_{nextIndex}";
|
||||
}
|
||||
model.gameObject.name = model.objectName;
|
||||
model.onModelClicked += FindAnyObjectByType<Panel_ConnectedObject>(FindObjectsInactive.Include).SetConnectedDataItem;
|
||||
models.Add(model);
|
||||
onModelsUpdated?.Invoke(models);
|
||||
}
|
||||
public void RemoveModel(SimulationModel model)
|
||||
{
|
||||
Debug.Log("remove");
|
||||
/*
|
||||
if (models.Any(x => x == model))
|
||||
return;
|
||||
*/
|
||||
Debug.Log("removeon");
|
||||
models.Remove(model);
|
||||
onModelsUpdated?.Invoke(models);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using RTG;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Octopus.Simulator;
|
||||
|
||||
public class RTGController : UnitySingleton<RTGController>
|
||||
{
|
||||
@@ -22,6 +23,8 @@ public class RTGController : UnitySingleton<RTGController>
|
||||
public List<GameObject> selectedObjects = new List<GameObject>();
|
||||
public System.Action onTransformBegin;
|
||||
public System.Action<List<GameObject>> onTransformChanged;
|
||||
|
||||
Panel_SimulationUI simulationUI;
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
@@ -54,6 +57,15 @@ public class RTGController : UnitySingleton<RTGController>
|
||||
|
||||
workGizmo = objectMoveGizmo;
|
||||
workGizmoId = GizmoId.None;
|
||||
simulationUI = FindAnyObjectByType<Panel_SimulationUI>();
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (Input.GetKeyDown(KeyCode.Delete)&& !simulationUI.isplaying)
|
||||
{
|
||||
Destroy(selectedObjects[0]);
|
||||
}
|
||||
}
|
||||
public void SetWorkGizmoId(GizmoId gizmoId)
|
||||
{
|
||||
|
||||
@@ -33,28 +33,28 @@ MonoBehaviour:
|
||||
m_Settings:
|
||||
m_SettingsList:
|
||||
m_List:
|
||||
- rid: 6289117031873904873
|
||||
- rid: 6289117031873904874
|
||||
- rid: 2193962276692426907
|
||||
- rid: 2193962276692426908
|
||||
- rid: 6852985685364965378
|
||||
- rid: 6852985685364965379
|
||||
- rid: 6852985685364965380
|
||||
- rid: 6852985685364965381
|
||||
- rid: 6289117031873904875
|
||||
- rid: 6289117031873904876
|
||||
- rid: 2193962276692426909
|
||||
- rid: 2193962276692426910
|
||||
- rid: 6852985685364965384
|
||||
- rid: 6852985685364965385
|
||||
- rid: 6289117031873904877
|
||||
- rid: 6289117031873904878
|
||||
- rid: 6289117031873904879
|
||||
- rid: 6289117031873904880
|
||||
- rid: 6289117031873904881
|
||||
- rid: 6289117031873904882
|
||||
- rid: 2193962276692426911
|
||||
- rid: 2193962276692426912
|
||||
- rid: 2193962276692426913
|
||||
- rid: 2193962276692426914
|
||||
- rid: 2193962276692426915
|
||||
- rid: 2193962276692426916
|
||||
- rid: 6852985685364965392
|
||||
- rid: 6289117031873904883
|
||||
- rid: 2193962276692426917
|
||||
- rid: 6852985685364965394
|
||||
- rid: 8712630790384254976
|
||||
- rid: 5092397466944798720
|
||||
- rid: 6289117031873904884
|
||||
- rid: 2193962276692426918
|
||||
m_RuntimeSettings:
|
||||
m_List:
|
||||
- rid: 6852985685364965378
|
||||
@@ -97,20 +97,14 @@ MonoBehaviour:
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 5092397466944798720
|
||||
type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
|
||||
m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
|
||||
m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
|
||||
- rid: 6289117031873904873
|
||||
- rid: 2193962276692426907
|
||||
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_Version: 0
|
||||
m_StripUnusedPostProcessingVariants: 1
|
||||
m_StripUnusedVariants: 1
|
||||
m_StripScreenCoordOverrideVariants: 1
|
||||
- rid: 6289117031873904874
|
||||
- rid: 2193962276692426908
|
||||
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
|
||||
@@ -122,7 +116,7 @@ MonoBehaviour:
|
||||
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
|
||||
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
|
||||
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
|
||||
- rid: 6289117031873904875
|
||||
- rid: 2193962276692426909
|
||||
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_Version: 0
|
||||
@@ -137,7 +131,7 @@ MonoBehaviour:
|
||||
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
|
||||
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
|
||||
- rid: 6289117031873904876
|
||||
- rid: 2193962276692426910
|
||||
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
@@ -146,7 +140,7 @@ MonoBehaviour:
|
||||
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
|
||||
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
|
||||
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
|
||||
- rid: 6289117031873904877
|
||||
- rid: 2193962276692426911
|
||||
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
|
||||
data:
|
||||
m_Version: 0
|
||||
@@ -159,13 +153,13 @@ MonoBehaviour:
|
||||
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
|
||||
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
|
||||
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
|
||||
- rid: 6289117031873904878
|
||||
- rid: 2193962276692426912
|
||||
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
|
||||
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
|
||||
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
|
||||
- rid: 6289117031873904879
|
||||
- rid: 2193962276692426913
|
||||
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
m_Version: 1
|
||||
@@ -178,12 +172,12 @@ MonoBehaviour:
|
||||
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
|
||||
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
|
||||
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
|
||||
- rid: 6289117031873904880
|
||||
- rid: 2193962276692426914
|
||||
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
m_Version: 1
|
||||
m_ProbeVolumeDisableStreamingAssets: 0
|
||||
- rid: 6289117031873904881
|
||||
- rid: 2193962276692426915
|
||||
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
m_Version: 1
|
||||
@@ -193,24 +187,30 @@ MonoBehaviour:
|
||||
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
|
||||
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
|
||||
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
|
||||
- rid: 6289117031873904882
|
||||
- rid: 2193962276692426916
|
||||
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
m_version: 0
|
||||
m_IncludeReferencedInScenes: 0
|
||||
m_IncludeAssetsByLabel: 0
|
||||
m_LabelToInclude:
|
||||
- rid: 6289117031873904883
|
||||
- rid: 2193962276692426917
|
||||
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
|
||||
data:
|
||||
m_Version: 1
|
||||
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
|
||||
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
|
||||
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
|
||||
- rid: 6289117031873904884
|
||||
- rid: 2193962276692426918
|
||||
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
|
||||
- rid: 5092397466944798720
|
||||
type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
|
||||
m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
|
||||
m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
|
||||
- rid: 6852985685364965378
|
||||
type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
|
||||
@@ -17,10 +17,9 @@ namespace Octopus.Simulator
|
||||
public event Action<LogicData> onLogicUpdated;
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
void Awake()
|
||||
{
|
||||
FindAnyObjectByType<WebReceiver>().onParameterRecived += RequestInfo;
|
||||
FindAnyObjectByType<MQTTManager>().onLogicUpdated += RequestInfo;
|
||||
FindAnyObjectByType<MQTTManager>().onLogicUpdated += UpdateInfo;
|
||||
}
|
||||
|
||||
public void RequestInfo()
|
||||
@@ -28,7 +27,13 @@ namespace Octopus.Simulator
|
||||
var requestURL = $"{WebManager.Instance.apiConfig.logic}/{WebParameters.config.logicId}";
|
||||
|
||||
WebManager.Instance.Reqeust<LogicData>(requestURL, RequestType.GET, GetDataFromInfo);
|
||||
}
|
||||
|
||||
public void UpdateInfo()
|
||||
{
|
||||
var requestURL = $"{WebManager.Instance.apiConfig.logic}/{WebParameters.config.logicId}";
|
||||
|
||||
WebManager.Instance.Reqeust<LogicData>(requestURL, RequestType.GET, UpdateDataFromInfo);
|
||||
}
|
||||
|
||||
void GetDataFromInfo(LogicData Data)
|
||||
@@ -48,5 +53,21 @@ namespace Octopus.Simulator
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateDataFromInfo(LogicData Data)
|
||||
{
|
||||
onLogicUpdated?.Invoke(Data);
|
||||
|
||||
currentData = Data;
|
||||
config = Data.webConfig;
|
||||
if (currentData.ModelFiles.Count >= 1)
|
||||
{
|
||||
SimulationModelFile files = currentData.ModelFiles[currentData.ModelFiles.Count - 1];
|
||||
if (files.id.HasValue)
|
||||
{
|
||||
WebParameters.config.modelId = files.id.Value.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -83,7 +83,7 @@ namespace Octopus.Simulator.Networks
|
||||
public void Connect(string clientName, string host, int port)
|
||||
{
|
||||
client = new MQTTClientBuilder()
|
||||
.WithOptions(new ConnectionOptionsBuilder().WithWebSocket(host,port).WithPath("/mqtt"))
|
||||
.WithOptions(new ConnectionOptionsBuilder().WithWebSocket(host,port).WithPath("/mqtt").WithTLS())
|
||||
.WithEventHandler(client => OnConnected(client, clientName))
|
||||
.WithEventHandler(OnStateChange)
|
||||
.WithEventHandler(OnDisconnected)
|
||||
|
||||
@@ -21,7 +21,8 @@ namespace Octopus.Simulator
|
||||
int currentFastIndex = 4;
|
||||
public Sprite playing;
|
||||
public Sprite pause;
|
||||
bool isplaying = false;
|
||||
public bool isplaying = false;
|
||||
public event Action<bool> onPlaying;
|
||||
|
||||
public event Action onLogicBTNClicked;
|
||||
|
||||
@@ -32,6 +33,7 @@ namespace Octopus.Simulator
|
||||
Button_Logic = transform.Find(nameof(Button_Logic)).GetComponent<Button>();
|
||||
Button_Complete = transform.Find(nameof(Button_Complete)).GetComponent<Button>();
|
||||
text_FastForward = Button_FastForward.GetComponentInChildren<TMP_Text>();
|
||||
onPlaying += onPlay;
|
||||
}
|
||||
|
||||
private void Start()
|
||||
@@ -56,7 +58,8 @@ namespace Octopus.Simulator
|
||||
{
|
||||
isplaying = false;
|
||||
Button_Play.image.sprite = pause;
|
||||
|
||||
Button_FastForward.interactable = true;
|
||||
onPlaying?.Invoke(isplaying);
|
||||
var requestURL = $"{requestAPI}/{WebParameters.id}/pause";
|
||||
webmanager.Reqeust<HistoryParameters>(requestURL, RequestType.POST, null);
|
||||
//Request_SimulationPause(null, $"{requestAPI}/{WebParameters.id}/pause");
|
||||
@@ -65,7 +68,8 @@ namespace Octopus.Simulator
|
||||
{
|
||||
isplaying = true;
|
||||
Button_Play.image.sprite = playing;
|
||||
|
||||
//Button_FastForward.interactable = false;
|
||||
onPlaying?.Invoke(isplaying);
|
||||
webmanager.Reqeust<SimulationData>(requestAPI, RequestType.POST, SimulationCreate, param);
|
||||
//Request_SimulationCreate(param, requestAPI);
|
||||
}
|
||||
@@ -205,6 +209,11 @@ namespace Octopus.Simulator
|
||||
//});
|
||||
}
|
||||
|
||||
void onPlay(bool flag)
|
||||
{
|
||||
Button_FastForward.interactable = !flag;
|
||||
}
|
||||
|
||||
public void PauseCallback(UpdatedSimulationsInfo response)
|
||||
{
|
||||
var requsetURL = $"{webmanager.apiConfig.history}/{WebParameters.id}/toggle-realtime";
|
||||
|
||||
@@ -15,17 +15,19 @@ namespace Octopus.Simulator
|
||||
Button projectMenuButton;
|
||||
[SerializeField]
|
||||
RectTransform menuPanel;
|
||||
[SerializeField]
|
||||
Button projectSaveButton;
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
void Awake()
|
||||
{
|
||||
FindAnyObjectByType<WebReceiver>().onParameterRecived += RequestInfo;
|
||||
projectMenuButton.onClick.AddListener(SetActive);
|
||||
FindAnyObjectByType<Panel_SimulationUI>().onPlaying+=onPlay;
|
||||
}
|
||||
public void RequestInfo()
|
||||
{
|
||||
var reqeustURL = $"{WebManager.Instance.apiConfig.project}/{WebParameters.config.projectId}";
|
||||
|
||||
|
||||
WebManager.Instance.Reqeust<ProjectInfoData>(reqeustURL, RequestType.GET, ProjectInfoCallback);
|
||||
|
||||
}
|
||||
@@ -33,6 +35,7 @@ namespace Octopus.Simulator
|
||||
public void ProjectInfoCallback(ProjectInfoData response)
|
||||
{
|
||||
SetText(response.name);
|
||||
WebManager.Instance.ProjectTitle = response.name;
|
||||
}
|
||||
|
||||
void SetText(string data)
|
||||
@@ -43,5 +46,10 @@ namespace Octopus.Simulator
|
||||
{
|
||||
menuPanel.gameObject.SetActive(!menuPanel.gameObject.activeSelf);
|
||||
}
|
||||
|
||||
void onPlay(bool flag)
|
||||
{
|
||||
projectSaveButton.interactable = !flag;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,9 @@ public enum SimulationModelType
|
||||
public abstract class SimulationModel : MonoBehaviour, IClickable
|
||||
{
|
||||
public string modelName;
|
||||
public string objectName;
|
||||
public SimulationModelType modelType;
|
||||
public string prefabName;
|
||||
public string modelID;
|
||||
public string nodeID;
|
||||
public string eventKey;
|
||||
@@ -28,7 +30,8 @@ public abstract class SimulationModel : MonoBehaviour, IClickable
|
||||
public Action<SimulationModel> onModelClicked;
|
||||
void Awake()
|
||||
{
|
||||
FitCollider();
|
||||
init();
|
||||
prefabName = gameObject.name.Replace("(Clone)", "");
|
||||
}
|
||||
|
||||
private void Start()
|
||||
@@ -38,11 +41,16 @@ public abstract class SimulationModel : MonoBehaviour, IClickable
|
||||
onModelClicked += (value)=>FindAnyObjectByType<Panel_PlacedObject>(FindObjectsInactive.Include).UnsetPlacedObjectDataItem();
|
||||
}
|
||||
|
||||
protected virtual void init()
|
||||
{
|
||||
FitCollider();
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
StartCoroutine(RunSimulationCoroutine());
|
||||
}
|
||||
private void OnDisable()
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (isQuitting) return;
|
||||
DataManager.I.RemoveModel(this);
|
||||
|
||||
@@ -327,7 +327,7 @@ public class ConveyorUnloadingToStoreData
|
||||
public string? ConveyorLabel { get; set; }
|
||||
|
||||
[JsonProperty("belt_speed")]
|
||||
public double? BeltSpeed { get; set; }
|
||||
public double? BeltSpeed { get; set; } = 1;
|
||||
|
||||
[JsonProperty("belt_length")]
|
||||
public double? BeltLength { get; set; }
|
||||
|
||||
@@ -58,8 +58,10 @@ public class SimulationModelSource : SimulationModel
|
||||
public Vector3 productDistance = new Vector3(0, 0.321f, 0);
|
||||
int productCount = 0;
|
||||
int defectCount = 0;
|
||||
private void Awake()
|
||||
|
||||
protected override void init()
|
||||
{
|
||||
base.init();
|
||||
eventKey = "generator_event";
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class TestCode : MonoBehaviour
|
||||
{
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if (Input.GetKeyDown(KeyCode.P))
|
||||
{
|
||||
DynamicGI.UpdateEnvironment();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0b14edf47f496e743bbd0c912036fc12
|
||||
33
Assets/WorkSpace/LH/TransformToolbarScript.cs
Normal file
33
Assets/WorkSpace/LH/TransformToolbarScript.cs
Normal file
@@ -0,0 +1,33 @@
|
||||
using UnityEngine;
|
||||
using Octopus.Simulator;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TransformToolbarScript : MonoBehaviour
|
||||
{
|
||||
Button Button_Hand;
|
||||
Button Button_Move;
|
||||
Button Button_Rotate;
|
||||
Button Button_Scale;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Button_Hand = transform.Find(nameof(Button_Hand)).GetComponent<Button>();
|
||||
Button_Move = transform.Find(nameof(Button_Move)).GetComponent<Button>();
|
||||
Button_Rotate = transform.Find(nameof(Button_Rotate)).GetComponent<Button>();
|
||||
Button_Scale = transform.Find(nameof(Button_Scale)).GetComponent<Button>();
|
||||
|
||||
}
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
FindAnyObjectByType<Panel_SimulationUI>().onPlaying += OnPlay;
|
||||
}
|
||||
|
||||
void OnPlay(bool flag)
|
||||
{
|
||||
Button_Hand.interactable = !flag;
|
||||
Button_Move.interactable = !flag;
|
||||
Button_Rotate.interactable = !flag;
|
||||
Button_Scale.interactable = !flag;
|
||||
}
|
||||
}
|
||||
2
Assets/WorkSpace/LH/TransformToolbarScript.cs.meta
Normal file
2
Assets/WorkSpace/LH/TransformToolbarScript.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4532cb1d47b03e243b7e5def77071685
|
||||
@@ -8,8 +8,12 @@ namespace UVC.Networks
|
||||
public string Host { get; private set; }
|
||||
public int Port { get; private set; }
|
||||
public string Token { get; private set; }
|
||||
public string BaseUrl => $"{Host}:{Port}";
|
||||
|
||||
#if UNITY_EDITOR
|
||||
//public string BaseUrl => $"{Host}:{Port}";
|
||||
public string BaseUrl => $"{Host}";
|
||||
#else
|
||||
public string BaseUrl => $"{Host}";
|
||||
#endif
|
||||
public void LoadFromResources(string resourcePath)
|
||||
{
|
||||
TextAsset jsonAsset = Resources.Load<TextAsset>(resourcePath);
|
||||
|
||||
@@ -51,6 +51,7 @@ namespace UVC.Networks
|
||||
private WebConfigLoader _webConfigLoader = new WebConfigLoader();
|
||||
private ApiConfigLoader _apiConfigLoader = new ApiConfigLoader();
|
||||
public APIEndPointsConfig apiConfig;
|
||||
public string ProjectTitle = "";
|
||||
|
||||
void Awake()
|
||||
{
|
||||
@@ -65,6 +66,7 @@ namespace UVC.Networks
|
||||
#if UNITY_EDITOR
|
||||
_webConfigLoader.LoadFromResources(_webConfigResourcePath);
|
||||
#else
|
||||
Debug.Log("onwebgl");
|
||||
WebReceiver receiver = FindAnyObjectByType<WebReceiver>();
|
||||
receiver.onWebConfigReceived += HandleWebConfigFromReceiver;
|
||||
#endif
|
||||
@@ -74,6 +76,7 @@ namespace UVC.Networks
|
||||
private void HandleWebConfigFromReceiver(string json)
|
||||
{
|
||||
_webConfigLoader.LoadFromJsonString(json);
|
||||
Debug.Log("handle");
|
||||
}
|
||||
|
||||
//별도의 Data Content 가 없을 경우 reqeustURL 과 callback 등 만을 parameter로 넘기면 됨
|
||||
@@ -95,6 +98,7 @@ namespace UVC.Networks
|
||||
private async UniTask<T> RequestAsync<T>(string requestURL, RequestType type, string json)
|
||||
{
|
||||
string fullUrl = _webConfigLoader.BaseUrl + requestURL;
|
||||
Debug.Log(fullUrl);
|
||||
|
||||
using (UnityWebRequest request = new UnityWebRequest(fullUrl, type.ToString()))
|
||||
{
|
||||
@@ -112,6 +116,7 @@ namespace UVC.Networks
|
||||
Debug.Log(requestURL);
|
||||
|
||||
string responseJson = request.downloadHandler.text;
|
||||
Debug.Log($"data:{responseJson}");
|
||||
Base<T> result = JsonConvert.DeserializeObject<Base<T>>(responseJson);
|
||||
return result.data;
|
||||
}
|
||||
|
||||
@@ -14,13 +14,13 @@ namespace Octopus.Simulator.Networks
|
||||
|
||||
public void Start()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
config.projectId = "15";
|
||||
//config.simulationId = "15";
|
||||
config.logicId = "14";
|
||||
WebParameters.config = config;
|
||||
onParameterRecived += FindAnyObjectByType<ProjectDataManager>().RequestInfo;
|
||||
onParameterRecived += FindAnyObjectByType<LogicDataManager>().RequestInfo;
|
||||
#if UNITY_EDITOR
|
||||
config.projectId = "37";
|
||||
//config.simulationId = "15";
|
||||
config.logicId = "42";
|
||||
WebParameters.config = config;
|
||||
onParameterRecived?.Invoke();
|
||||
#else
|
||||
Application.ExternalCall("loadingComplete");
|
||||
|
||||
@@ -39,7 +39,8 @@ namespace Octopus.Simulator.Networks
|
||||
{
|
||||
var tmpSimulationModelInfo = new SimulationModelInfo();
|
||||
|
||||
tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", "");
|
||||
//tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", "");
|
||||
tmpSimulationModelInfo.prefabName = item.prefabName;
|
||||
tmpSimulationModelInfo.modelName = item.modelName;
|
||||
//tmpSimulationModelInfo.modelType = item.modelType.ToString();
|
||||
tmpSimulationModelInfo.modelID = item.modelID;
|
||||
@@ -115,8 +116,11 @@ namespace Octopus.Simulator.Networks
|
||||
{
|
||||
var tmpSimulationModelInfo = new SimulationModelInfo();
|
||||
|
||||
tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", "");
|
||||
//tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", "");
|
||||
tmpSimulationModelInfo.prefabName = item.prefabName;
|
||||
tmpSimulationModelInfo.objectName = item.objectName;
|
||||
tmpSimulationModelInfo.modelName = item.modelName;
|
||||
//tmpSimulationModelInfo.modelName = item.modelName;
|
||||
//tmpSimulationModelInfo.modelType = item.modelType;
|
||||
tmpSimulationModelInfo.modelID = item.modelID;
|
||||
tmpSimulationModelInfo.nodeID = item.nodeID;
|
||||
@@ -131,7 +135,7 @@ namespace Octopus.Simulator.Networks
|
||||
|
||||
var modelClass = new WebModelClass();
|
||||
modelClass.logicId = int.Parse(WebParameters.config.logicId);
|
||||
modelClass.name = "new model";
|
||||
modelClass.name = $"{WebManager.Instance.ProjectTitle}model";
|
||||
modelClass.description = "new model";
|
||||
modelClass.data.info = jsonObject;
|
||||
|
||||
@@ -185,7 +189,6 @@ namespace Octopus.Simulator.Networks
|
||||
|
||||
loadInfos = JsonConvert.DeserializeObject<List<SimulationModelInfo>>(jsonData);
|
||||
|
||||
|
||||
string resourcePath = "Library/LibraryPrefab";
|
||||
|
||||
Dictionary<string, SimulationModel> loadModels = new Dictionary<string, SimulationModel>();
|
||||
@@ -197,6 +200,7 @@ namespace Octopus.Simulator.Networks
|
||||
var spawnItem = spawn.GetComponent<SimulationModel>();
|
||||
|
||||
spawnItem.modelName = item.modelName;
|
||||
spawnItem.objectName = item.objectName;
|
||||
//spawnItem.modelType = item.modelType;
|
||||
spawnItem.modelID = item.modelID;
|
||||
spawnItem.nodeID = item.nodeID;
|
||||
|
||||
@@ -13,6 +13,9 @@ public class SimulationModelInfo
|
||||
[SerializeField]
|
||||
public string modelType;
|
||||
|
||||
[SerializeField]
|
||||
public string objectName;
|
||||
|
||||
[SerializeField]
|
||||
public string modelID;
|
||||
|
||||
|
||||
@@ -44,8 +44,8 @@ PlayerSettings:
|
||||
m_HolographicTrackingLossScreen: {fileID: 0}
|
||||
defaultScreenWidth: 1024
|
||||
defaultScreenHeight: 768
|
||||
defaultScreenWidthWeb: 960
|
||||
defaultScreenHeightWeb: 600
|
||||
defaultScreenWidthWeb: 1920
|
||||
defaultScreenHeightWeb: 1080
|
||||
m_StereoRenderingPath: 0
|
||||
m_ActiveColorSpace: 1
|
||||
unsupportedMSAAFallback: 0
|
||||
@@ -82,7 +82,7 @@ PlayerSettings:
|
||||
androidApplicationEntry: 2
|
||||
defaultIsNativeResolution: 1
|
||||
macRetinaSupport: 1
|
||||
runInBackground: 0
|
||||
runInBackground: 1
|
||||
muteOtherAudioSources: 0
|
||||
Prepare IOS For Recording: 0
|
||||
Force IOS Speakers When Recording: 0
|
||||
|
||||
Reference in New Issue
Block a user