From c6347f8ea8a12fdd86ec2cb006092c759b938cb8 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 6 Aug 2021 15:23:34 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E5=9C=A8=E5=BA=AB?= =?UTF-8?q?=E7=B4=A0=E6=9D=90=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/Main_StockMeter_Unreleased.png | Bin 2497 -> 2742 bytes .../Material/Main/Main_StockMeter_mask.png | Bin 0 -> 245 bytes .../Main/Main_StockMeter_mask.png.meta | 92 ++++++++++++++++++ .../MyGame/Scenes/Main/Prefabs/Meter.prefab | 89 ++++++++++++++++- 4 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png index a71e702206ab3db0e7d1fd98ed32dc313d49d41c..145f8e90f2543e8b04ec666ea5a954adcd45201c 100644 GIT binary patch delta 2635 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 delta 2420 zcmaiu`9IT-1IOPRGS!CG=f-;{#4#kQv!)ko-sG(dDPg*6X2G z4#j;aIf^v5`Wkyjjy}~~#~o#`F5Ih`V{P4j?gE>guHAKSpq#OqAz8=w6hOw+oh!5T zI(l8wQ+4CfV1>!Kd2ST$*&)Tj3js64CDjI5{kvt`PkDAXm$$B%_6lFTABIljxDcEu z&`~K9$Cbm0`*ZMjg8{!NQH81C5UI2~_l)#P%+4@(u}(n7ex4$tyDbko&4Djq9mMNA zX)2&)P}~8t7p)mDZd5u|g$Q=Uz5L)h!4)pKHG?$c+^P1Vd^wwIO_oASBQqescQQ?f5gS=SZiH_P5KL8=KGQndzQ9kw6m7O5Zm9 z*m(b3qoqE%F`g@y3qMg@y~(I zJ2`-lI>QdAUH5_1=Pn_4>twlvcY#?+480P!#+1K;=+i!#@IatT-GQSt#H1L%HrqW` zGg0^Q`FnTirn%AEA&33V1K`Wzt9jcC#QAM%BQL@%D2?JD#a5>0W>zhtm+rhh_^juk zIK6p8sHnk>>Ms7_tebV}m0{7tGfHKb?%QrW*I3|;1PExZorA{0EI4+t9gG~IQg$6+ z=+A_-b@GX{ehf(|34;zK-Pv3?`O^7?3_s7@aD3*CA2nJ%y7{_mLYwF5!&JK{-&t1E zQfV+~AWd;X+g%9dOF50TdwsAgc}o=I4M&3_*@f}gkgbQ7)iDf5bO<&|#MA>HBFOJK zE`iFX0f&N zJ7+L-yCWcKAB+8FWppGlhLN{Y1T}U;7>DJrBknJi{dqvn#CpNc9m3fUw)~1=eQm_~ zQ-DeVv9;}Ha;`U1*GysS^hp>0av|f#s#Vo#{>zKm&-W5&4V{roMg4BG2`nkje*3uO zm^VyYP_yr`m3{v;9>&&_>s?fZ?w#y93Q}; zcZGYK9;09<1qI8qGTv8&%_>hCIewm|d`p}@+_ul}}gy2f;Srol;n8liHUaoDhU;a*5^jd?~AoIuOK6i{9f+iunVr|~Fq8;wW zzPcp|mbXY{2GtVqQ4r3;K-9V*RS!oKYkFCAbif5WPO|)p^$IZUYsXO4dDWXIkQX{V zbVJUDq(I|Vq@#bG_3aZxAZPhhiU4zN_QU?tooiF z(pMA=V*Y6P!g*TbGKCJbO{pACvLs1nt@{Sg^L$@f?p&{!fRC9{SL)L$+8uoFdQCpA z0QhTyI_~k@CNXNlQqyQx&P>~qX7e70N-=2<12Kk8XuI|;KiLyBnWM?1XmTE3er4GH zVPAb!{l(iyiAo-}UvS^X-@5AnzDHU`=KNIBJso+U62H%(XqP+Koi5?kPXK=Nr8=|6 z+AU!d*G;9;*nU@v@Fz+sa{LzAA>H9mQs(hSrRlg4g!PdH&zkMIMMHA^?G6*h;1QJ8 z&Kl)2(P&A(u)!4c8BPfz1pk|IXOicDq}y(hH!=XI=c%mpj3!^m?{ia`3j8PcfeTe* zIe-INx=DF!Hz#f?_r-S^lS>uas979N0pQ<|0)7Vo$bXKviE^3_Bb`_9<0_3J}6lfuQT0@QCSWY}q=!{M^Vrl0a z3R%6f;W|NNK1!FAyc205i=P5DR?laCi-WWz9a(vYON%-RF`vpPh?e0FcNar}S_Rnj z&j_4K*Nt>(^VtbWS=K)A2|13)F zJl2>j3e@h3wVTH)4*ZC3Ni>cwA=+b5jLAsg$X~oSzWfnieBYyIY2c&weTC(gEAL|p zoB=-b?vOrrRU@z0ptD$po0tBkqYaFp{RoS+=wY*0O5-!S31qqtIX&Ue#W4`)EW z1^Y71#7+O!+{-hcr9a_V5AL~?fPdgBk3|;xvO90K-H^4fytZwy`1Mub*;lk% Pz%SgKyfBT&!?OMlmGqq8 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..6b1a7eccbeb2d55077b667c4544d48894e79842f GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^SwNh|!2~4NG)~?Pq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c6;1baaSW-r_2z=1AOiyji^A6W=i8eXvkSgZIeJy&!gBxl zc3)mzUd~_p>&r{$`F6Fxz(TbzE-&|&2MS$o2MT>z2vh}?p+GUj7@*1T_lqVlu;(+M U^mLay0dyjRr>mdKI;Vst01NnVLI3~& literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png.meta new file mode 100644 index 00000000..8e9d1073 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_mask.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bb188fd763f57c0429accb1301e0f529 +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/Main/Prefabs/Meter.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab index 7f0b49e6..65e7d810 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab @@ -1,5 +1,85 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1295069548822797723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1281843504903824541} + - component: {fileID: 1610285039240075299} + m_Layer: 0 + m_Name: New Sprite Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1281843504903824541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295069548822797723} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.065, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4798599775605052312} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &1610285039240075299 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295069548822797723} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: bb188fd763f57c0429accb1301e0f529, type: 3} + m_MaskAlphaCutoff: 0.037 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 + m_SpriteSortPoint: 0 --- !u!1 &2400848238848264989 GameObject: m_ObjectHideFlags: 0 @@ -29,7 +109,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4798599775605052312} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8901195797687025316 SpriteRenderer: @@ -79,7 +159,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 1 m_SpriteSortPoint: 0 --- !u!1 &3072131335653526340 GameObject: @@ -331,7 +411,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8231967146614545174} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.263, y: 0.317, z: 0} + m_LocalPosition: {x: -0.285, y: 0.333, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4798599775605052312} @@ -415,8 +495,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3665723643188271316} - - {fileID: 2127467310855589365} + - {fileID: 1281843504903824541} - {fileID: 599489329584271214} + - {fileID: 2127467310855589365} m_Father: {fileID: 3665723641945798049} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}