Merge branch 'jym/250528_01' into jym/250528_02
This commit is contained in:
@@ -169,6 +169,107 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3}
|
||||
m_PrefabInstance: {fileID: 396217241}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &63933899
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 545811781}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 500
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 200
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6745165671321524316, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Panel_SaveAndOpenChecker
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6745165671321524316, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
--- !u!224 &110380560 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1112357447546033534, guid: 86fac645f610e6c43a57c53dec3f6e48, type: 3}
|
||||
@@ -2727,6 +2828,8 @@ RectTransform:
|
||||
- {fileID: 1004894728}
|
||||
- {fileID: 1099738088}
|
||||
- {fileID: 802579212}
|
||||
- {fileID: 1970313509}
|
||||
- {fileID: 1276837142}
|
||||
m_Father: {fileID: 1981809316}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@@ -2778,6 +2881,8 @@ MonoBehaviour:
|
||||
panel_multilingualsettingmodal: {fileID: 0}
|
||||
panel_loggingmodal: {fileID: 0}
|
||||
panel_exitchecker: {fileID: 0}
|
||||
panel_saveandnewchecker: {fileID: 0}
|
||||
panel_saveandopenchecker: {fileID: 0}
|
||||
panel_datarepository: {fileID: 0}
|
||||
panel_agv: {fileID: 0}
|
||||
panel_dataconnectmodal: {fileID: 0}
|
||||
@@ -2889,7 +2994,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 1af5890e725b4a74397a6abcbc5c8b43, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
AGVMoveSpeed: 0.15
|
||||
AGVMoveSpeed: 0.3
|
||||
AGVRotateSpeed: 0.15
|
||||
--- !u!1 &574297194
|
||||
GameObject:
|
||||
@@ -8614,6 +8719,11 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7257151592976347537, guid: d524adc6297ea50418c16190b3f42f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 1265526093}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1276837142 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1018205932050094641, guid: 192ba749438045e4bb32753ffff354b1, type: 3}
|
||||
m_PrefabInstance: {fileID: 63933899}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1287523440
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -9259,6 +9369,107 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 9204995643987852086, guid: b7fb9c984bb17994ca59c9312245bd9e, type: 3}
|
||||
m_PrefabInstance: {fileID: 1712022042}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1766393231
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 545811781}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 500
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 200
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Panel_SaveAndNewChecker
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
--- !u!224 &1791222926 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3}
|
||||
@@ -9439,6 +9650,11 @@ MonoBehaviour:
|
||||
_canBeDisplayed: 1
|
||||
_isExpanded: 1
|
||||
_physicsMode: 1
|
||||
--- !u!224 &1970313509 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3}
|
||||
m_PrefabInstance: {fileID: 1766393231}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1976685923
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user