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:
  レシピPOP背景追加
  仕入れ画面配置途中
This commit is contained in:
kimura 2021-08-04 17:53:58 +09:00
parent 44ebc3d4f4 90452b8b20
commit 2b4f50b354
7 changed files with 2619 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_FryingPan_a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

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

@ -1106,8 +1106,8 @@ Camera:
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0 m_TargetDisplay: 0
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 0
m_AllowMSAA: 1 m_AllowMSAA: 0
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 0
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1

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

@ -1329,8 +1329,8 @@ Camera:
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0 m_TargetDisplay: 0
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 1 m_HDR: 0
m_AllowMSAA: 1 m_AllowMSAA: 0
m_AllowDynamicResolution: 0 m_AllowDynamicResolution: 0
m_ForceIntoRT: 0 m_ForceIntoRT: 0
m_OcclusionCulling: 1 m_OcclusionCulling: 1

4
popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
View File

@ -1259,7 +1259,7 @@ GameObject:
- component: {fileID: 858120092} - component: {fileID: 858120092}
- component: {fileID: 858120091} - component: {fileID: 858120091}
m_Layer: 5 m_Layer: 5
m_Name: Image m_Name: background
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -1297,7 +1297,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

8
popcorn/Assets/MyGame/Scenes/shopping.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d7426f33da01ed44788fb8d7e53a1c9c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2598
popcorn/Assets/MyGame/Scenes/shopping/shopping.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
popcorn/Assets/MyGame/Scenes/shopping/shopping.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9c9b9e2851656c84e91e3c457a81433d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: