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

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

This commit is contained in:
koya_15 2021-11-30 19:22:31 +09:00
parent fccb5a2ceb e9b0111a9d
commit 8d28a511b2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 373 KiB

After

Width:  |  Height:  |  Size: 374 KiB

12
popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
View File

@ -1185,6 +1185,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2535613031869306226, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 134.89453
objectReference: {fileID: 0}
- target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_IsActive
@ -1435,6 +1440,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7854392631165193410, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 134.89453
objectReference: {fileID: 0}
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
@ -1958,7 +1968,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 13
orthographic size: 12.8
m_Depth: -1
m_CullingMask:
serializedVersion: 2