From d2383eb0561c0ced4abaa74ecdd246e91274b060 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Tue, 10 Aug 2021 14:31:02 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E4=BD=9C=E3=82=8C?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=83=9C=E3=82=BF=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Material/Main/recipe/ui_button_gray_a.png | Bin 0 -> 3364 bytes .../Main/recipe/ui_button_gray_a.png.meta | 92 ++++++++ .../recipe/ui_button_icon_make_logo_gray.png | Bin 0 -> 1887 bytes .../ui_button_icon_make_logo_gray.png.meta | 92 ++++++++ .../MyGame/Scenes/recipe/RecipeChoice.unity | 202 +++++++++++++++++- .../MyGame/Scenes/shopping/shopping.unity | 6 +- 6 files changed, 385 insertions(+), 7 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_a.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_a.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo_gray.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo_gray.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_a.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_a.png new file mode 100644 index 0000000000000000000000000000000000000000..8277ecf7b9561afa6a12878fc65e00fa641ee498 GIT binary patch literal 3364 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 Z7yv48k3ycY9fbe@002ovPDHLkV1h1#aPR;C literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo_gray.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo_gray.png.meta new file mode 100644 index 00000000..167ba134 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo_gray.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: cfb90a2d77f52f8449f001ae3c506486 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index ce423e1f..9e779df4 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -536,6 +536,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 389422778} m_CullTransparentMesh: 0 +--- !u!1 &430811414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 430811415} + - component: {fileID: 430811417} + - component: {fileID: 430811416} + m_Layer: 5 + m_Name: Image_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &430811415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430811414} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1037294271} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 4} + m_SizeDelta: {x: 102, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &430811416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430811414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cfb90a2d77f52f8449f001ae3c506486, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &430811417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430811414} + m_CullTransparentMesh: 0 --- !u!1 &498799265 GameObject: m_ObjectHideFlags: 0 @@ -1121,7 +1195,7 @@ RectTransform: - {fileID: 707887859} - {fileID: 374985849} m_Father: {fileID: 1001521034} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1524,6 +1598,7 @@ RectTransform: m_Children: - {fileID: 843133639} - {fileID: 1853630203} + - {fileID: 1037294271} - {fileID: 731319771} - {fileID: 1626721124} - {fileID: 2135558976} @@ -1608,6 +1683,125 @@ RectTransform: m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 836, y: 1054} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1037294270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1037294271} + - component: {fileID: 1037294274} + - component: {fileID: 1037294273} + - component: {fileID: 1037294272} + m_Layer: 5 + m_Name: Button_make_off + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1037294271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1037294270} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 430811415} + m_Father: {fileID: 1001521034} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 157, y: 158} + m_SizeDelta: {x: 230, y: 112} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1037294272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1037294270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1037294273} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1037294273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1037294270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10e3190c1e1a2fc44859100040f3310c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1037294274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1037294270} + m_CullTransparentMesh: 0 --- !u!1 &1109202677 GameObject: m_ObjectHideFlags: 0 @@ -1794,7 +1988,7 @@ RectTransform: - {fileID: 2045825933} - {fileID: 1782089965} m_Father: {fileID: 1001521034} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2318,7 +2512,7 @@ RectTransform: - {fileID: 138926718} - {fileID: 1811755283} m_Father: {fileID: 1001521034} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -3091,7 +3285,7 @@ RectTransform: - {fileID: 1197864697} - {fileID: 389422779} m_Father: {fileID: 1001521034} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index b3aa1fe5..237600f5 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -1101,10 +1101,10 @@ RectTransform: m_Father: {fileID: 1098091308} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -64} - m_SizeDelta: {x: 1028, y: 1150} + m_SizeDelta: {x: 8, y: -1058} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &666905498 PrefabInstance: