Merge branch 'pgd/20250527merge' into pgd/20250527_merge2

This commit is contained in:
geondo55
2025-05-27 16:55:01 +09:00
27 changed files with 1227 additions and 41 deletions

View File

@@ -164,11 +164,157 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
sceneObjects: []
--- !u!224 &11436643 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
m_PrefabInstance: {fileID: 396217241}
m_PrefabAsset: {fileID: 0}
--- !u!224 &110380560 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1112357447546033534, guid: 86fac645f610e6c43a57c53dec3f6e48, type: 3}
m_PrefabInstance: {fileID: 8788018936673242657}
m_PrefabAsset: {fileID: 0}
--- !u!1 &189404504
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 189404505}
- component: {fileID: 189404509}
- component: {fileID: 189404508}
- component: {fileID: 189404507}
- component: {fileID: 189404506}
m_Layer: 5
m_Name: Button_Play
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &189404505
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
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: 11436643}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &189404506
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &189404507
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 189404508}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &189404508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: 16ab77a8cc636504bada37c9dd4971ef, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &189404509
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189404504}
m_CullTransparentMesh: 1
--- !u!1 &216528115
GameObject:
m_ObjectHideFlags: 0
@@ -1529,7 +1675,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
insertIndex: -1
addedObject: {fileID: 189404505}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
--- !u!224 &416036583 stripped
@@ -2227,6 +2376,7 @@ RectTransform:
- {fileID: 1439596647}
- {fileID: 1085911555}
- {fileID: 1712022043}
- {fileID: 740571666}
- {fileID: 1195713950}
- {fileID: 917198748}
- {fileID: 110380560}
@@ -2292,6 +2442,7 @@ MonoBehaviour:
panel_loggingmodal: {fileID: 0}
panel_exitchecker: {fileID: 0}
panel_datarepository: {fileID: 0}
panel_agv: {fileID: 0}
panel_dataconnectmodal: {fileID: 0}
panel_alarmconnectmodal: {fileID: 0}
--- !u!114 &545811783
@@ -2357,6 +2508,52 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!1 &571004138
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 571004139}
- component: {fileID: 571004140}
m_Layer: 0
m_Name: AGVManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &571004139
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 571004138}
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: 1093055756}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &571004140
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 571004138}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1af5890e725b4a74397a6abcbc5c8b43, type: 3}
m_Name:
m_EditorClassIdentifier:
AGVMoveSpeed: 0.15
AGVRotateSpeed: 0.15
--- !u!1 &574297194
GameObject:
m_ObjectHideFlags: 0
@@ -3179,6 +3376,112 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3}
m_PrefabInstance: {fileID: 722122562}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &740571665
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_AnchorMin.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_SizeDelta.x
value: 318
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_SizeDelta.y
value: 972.8
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_AnchoredPosition.x
value: -344
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -44
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7827388610028740651, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_Name
value: Panel_AGV
objectReference: {fileID: 0}
- target: {fileID: 7827388610028740651, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
--- !u!224 &740571666 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3}
m_PrefabInstance: {fileID: 740571665}
m_PrefabAsset: {fileID: 0}
--- !u!1 &749092879
GameObject:
m_ObjectHideFlags: 0
@@ -4176,6 +4479,7 @@ Transform:
- {fileID: 294055731}
- {fileID: 349372257}
- {fileID: 1155210}
- {fileID: 571004139}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1093055757