fixed combining branch

This commit is contained in:
slevy14
2023-04-27 20:12:07 -07:00
parent 1b634fd829
commit 153a1b4f8d
3 changed files with 17 additions and 7 deletions

View File

@@ -357,11 +357,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
propertyPath: m_LocalPosition.x
value: -30.56
value: -14.54
objectReference: {fileID: 0}
- target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
propertyPath: m_LocalPosition.y
value: -10.5
value: -10.53
objectReference: {fileID: 0}
- target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
propertyPath: m_LocalPosition.z
@@ -1365,7 +1365,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &724240633
RectTransform:
m_ObjectHideFlags: 0
@@ -2670,7 +2670,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1385054184
RectTransform:
m_ObjectHideFlags: 0