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-07-20 17:11:09 +09:00
parent ba55d30275 d35a3e40a6
commit 2f1c1d9f6c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
popcorn/Assets/MyGame/Scenes/Main/Main.unity
View File

@ -1250,6 +1250,11 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916834121473268, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
--- !u!1001 &3915769149207111994 --- !u!1001 &3915769149207111994

4
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -495,7 +495,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 5 m_SortingOrder: 8
m_Sprite: {fileID: 21300000, guid: 36cd734b7c82efc44a9ea922f8d011f8, type: 3} m_Sprite: {fileID: 21300000, guid: 36cd734b7c82efc44a9ea922f8d011f8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -2944,7 +2944,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 5 m_SortingOrder: 8
m_Sprite: {fileID: 21300000, guid: 36cd734b7c82efc44a9ea922f8d011f8, type: 3} m_Sprite: {fileID: 21300000, guid: 36cd734b7c82efc44a9ea922f8d011f8, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0