From a92ad6dd45390da9f7c2c5b3b7bbbbe9e9b8c41d Mon Sep 17 00:00:00 2001 From: koya_15 Date: Tue, 12 Oct 2021 12:39:38 +0900 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E7=90=86=E9=96=8B=E5=A7=8B=E8=AA=AC?= =?UTF-8?q?=E6=98=8E=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E7=B4=A0=E6=9D=90=E8=BF=BD=E5=8A=A0=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cooking/ui_cooking_explanation_Arrow.png | Bin 2826 -> 6963 bytes .../ui_cooking_explanation_Arrow.png.meta | 2 +- .../ui_cooking_explanation_Arrow_a.png | Bin 0 -> 825 bytes .../ui_cooking_explanation_Arrow_a.png.meta | 92 ++++++++++ .../ui_cooking_explanation_Arrow_b.png | Bin 0 -> 1351 bytes .../ui_cooking_explanation_Arrow_b.png.meta | 92 ++++++++++ .../MyGame/Scenes/Cooking/Cooking.unity | 168 +++++++++++++++++- .../CornField/ReinforcementDetail.unity | 2 +- 8 files changed, 345 insertions(+), 11 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_a.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_a.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow.png b/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow.png index 384a6539f893a9f2631148400e54a8f46f096999..b64b04d9e4ee0731c5509dc8595f746c756bebfa 100644 GIT binary patch literal 6963 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 KtAba$AM!t$GPC3W delta 2817 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 DQ37<3 literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_a.png.meta new file mode 100644 index 00000000..5e8f9867 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b08ddee5de5a1d34791a8e480f8bef7e +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/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png b/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png new file mode 100644 index 0000000000000000000000000000000000000000..0342bd2bfb5ecd11818b5a1de4ccfc6a6b5c9afa GIT binary patch literal 1351 zcmV-N1-SZ&P)G=bieeuB_XU~(@sJydVDc&P}|6g*fDQmKc6LQ}zuh~%Q) z)OqV$T~`T8em%pw4Yg!5+Zot!y!yz zl_|e0VRkYF61{Luwu)it9|WVC4)1g{K!gaqX@D0-dFNc*v}r`cRNgTdqQJ55pe^Zp zq6x|EKDxEOlx*;GnlPQT zAOf`Q$6GGMGz2hb=PPl5vS2z4h*eB+*m@=bcAq|XuY+j{uAk+5cf{R!<*ckm%{3h& z#4<)_mLPa+v{v1In1Z0R&{%SN1>K^gMh*cYqz6ab6bGj8Mte0gISzQ|{iO%)lvl_z z#|9sqLC?OdoYu~$G6eZs89BwH zJhGWrh>D)+-5#V*ZM-Sl;0($nh%v_9KsIELY;sbZC##Q)y<-7mXQpRO5=bOYUcEq` zn0BJAQ!sY0fuU-UR|a`xowH&YcCxKQU<25~P@MvjXD07Z!|GVQ=&M-D;J|cmZ@);S21iW2ZF>qJfvy8mt&9& z+e*mnKaV7NW1No#Oc2-xHgdhv4|0a`%&-ro@+5|hGqF4}?^5>2u=Qh5ije1N?VsM% z)Xrn)c_ayB9#%1&)ecerfSjZ}!~5{Q2x8be=?7U7R;nt6t+fjsu~lvLK#p3+Qr0Lt z*jNn?HdZm^f$Uin%If(+9$OyDI%ZF8Zpl)&wwCJZzu-RTn9K*fi1K2dYt~r^D=_g+8wG_LNQQY1hz1|u@kn|_Nz^OHK?e{ z!)ga?U{;5<2ZF>*y+eIPsHie|io@8!28KF8E5WeaXe*rmCR9|JDi}L+Rt2&diC90j zIML3;D6TN>R@i+BTd+izTEP-NVVUzzFfbE5Q?VX#IjXSJ7Io4zu&6W9GGizP%F2fQ zp_dsW%(AeB?;7!Kdwd>OizVAKuI@DPlY_vOGg08 zplWf>leEVkX5rXFTuQAgPEltxFCfnWE9CVJV$VbC!-LZ=U1Mh5Q7-9>(u%p%X zq(*Cx&rSxYJ_vP`86z7n)F+M0RUjzf}B*k%X$C+002ov JPDHLkV1nSGbxQyM literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png.meta new file mode 100644 index 00000000..c848eb3d --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/cooking/ui_cooking_explanation_Arrow_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 10c1478ec165ce6459210472a8274d21 +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/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 4580a9ab..4eccccb8 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -148,15 +148,15 @@ RectTransform: m_GameObject: {fileID: 54567201} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1601191536} - m_RootOrder: 0 + m_RootOrder: 1 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: 0} - m_SizeDelta: {x: 450, y: 102} + m_SizeDelta: {x: 402, y: 402} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &54567203 MonoBehaviour: @@ -178,7 +178,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 590b980200de16048815d54aa48a1aab, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -386,7 +386,7 @@ RectTransform: - {fileID: 156418750} - {fileID: 1705896410} m_Father: {fileID: 7182226549102099027} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2497,6 +2497,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 934697755} m_CullTransparentMesh: 0 +--- !u!1 &964130194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 964130195} + - component: {fileID: 964130197} + - component: {fileID: 964130196} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &964130195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964130194} + 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: 1601191536} + m_RootOrder: 2 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &964130196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964130194} + 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: b08ddee5de5a1d34791a8e480f8bef7e, 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 &964130197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964130194} + m_CullTransparentMesh: 0 --- !u!1 &970062596 GameObject: m_ObjectHideFlags: 0 @@ -2903,12 +2977,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] - m_Father: {fileID: 1601191536} + m_Father: {fileID: 7182226549102099027} m_RootOrder: 1 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: -32, y: -90} + m_AnchoredPosition: {x: -32, y: -400.99997} m_SizeDelta: {x: 192, y: 206} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1207852120 @@ -3627,8 +3701,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1707428398} - {fileID: 54567202} - - {fileID: 1207852119} + - {fileID: 964130195} m_Father: {fileID: 7182226549102099027} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3847,6 +3922,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1705896409} m_CullTransparentMesh: 0 +--- !u!1 &1707428397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1707428398} + - component: {fileID: 1707428400} + - component: {fileID: 1707428399} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1707428398 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707428397} + 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: 1601191536} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1707428399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707428397} + 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: 10c1478ec165ce6459210472a8274d21, 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 &1707428400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707428397} + m_CullTransparentMesh: 0 --- !u!1 &1759816007 GameObject: m_ObjectHideFlags: 0 @@ -4709,6 +4858,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1601191536} + - {fileID: 1207852119} - {fileID: 250366630} m_Father: {fileID: 676036207} m_RootOrder: 4 @@ -4862,7 +5012,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &8786490829224139677 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index c21bf4ad..fcc61b44 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -1022,7 +1022,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} m_Name: m_EditorClassIdentifier: - onClickPlaySEFilename: se_ButtonTap + onClickPlaySEFilename: se_CornField_release randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0