yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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-10-15 19:30:47 +09:00
parent 43187af2d0 fffe22ea67
commit e54293dce9
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
View File

@ -1188,7 +1188,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -82.000015, y: -212.99997} m_AnchoredPosition: {x: -217.1, y: -82.1}
m_SizeDelta: {x: 106, y: 110} m_SizeDelta: {x: 106, y: 110}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &137127164298331676 --- !u!222 &137127164298331676
@ -1621,7 +1621,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -220, y: -82} m_AnchoredPosition: {x: -82.2, y: -212.3}
m_SizeDelta: {x: 106, y: 110} m_SizeDelta: {x: 106, y: 110}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3270954252519000258 --- !u!222 &3270954252519000258

6
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab
View File

@ -915,9 +915,9 @@ RectTransform:
m_Father: {fileID: 2912042418274684491} m_Father: {fileID: 2912042418274684491}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 526, y: -564} m_AnchoredPosition: {x: 12, y: -564}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2912042419150224407 --- !u!114 &2912042419150224407

25
popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
View File

@ -399,6 +399,31 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -22 value: -22
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1674431630079185179, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1674431630079185179, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1674431630079185179, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1674431630079185179, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1674431630079185179, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_SizeDelta.x
value: 1765.9999
objectReference: {fileID: 0}
- target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive