Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop

* 'develop' of https://bitbucket.org/usaya/popcorn:
  ボタン調整
This commit is contained in:
kimura 2021-07-09 14:17:31 +09:00
commit cc496a9192
6 changed files with 78 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -200,6 +200,26 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 13667850, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 82
objectReference: {fileID: 0}
- target: {fileID: 13667850, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 64
objectReference: {fileID: 0}
- target: {fileID: 13667850, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_AnchoredPosition.x
value: -50.00001
objectReference: {fileID: 0}
- target: {fileID: 118497225, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 234
objectReference: {fileID: 0}
- target: {fileID: 118497225, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 120
objectReference: {fileID: 0}
- target: {fileID: 130281749, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_Name
value: Button_growth
@ -230,11 +250,67 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_AnchoredPosition.x
value: -203
value: -215
objectReference: {fileID: 0}
- target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_AnchoredPosition.y
value: -202
value: -212
objectReference: {fileID: 0}
- target: {fileID: 1339603269, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1339603269, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 42
objectReference: {fileID: 0}
- target: {fileID: 1339603269, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_AnchoredPosition.x
value: 44
objectReference: {fileID: 0}
- target: {fileID: 1464061989, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1464061989, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 42
objectReference: {fileID: 0}
- target: {fileID: 1464061989, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_AnchoredPosition.x
value: 44.00004
objectReference: {fileID: 0}
- target: {fileID: 1823819595, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 254
objectReference: {fileID: 0}
- target: {fileID: 1823819595, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 106
objectReference: {fileID: 0}
- target: {fileID: 1974020075, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 82
objectReference: {fileID: 0}
- target: {fileID: 1974020075, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 64
objectReference: {fileID: 0}
- target: {fileID: 1974020075, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_AnchoredPosition.x
value: -50
objectReference: {fileID: 0}
- target: {fileID: 2041305253, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2041305254, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.x
value: 234
objectReference: {fileID: 0}
- target: {fileID: 2041305254, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
propertyPath: m_SizeDelta.y
value: 120
objectReference: {fileID: 0}
- target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}