diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame.png index 170811d5..c80058f6 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_White.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_White.png new file mode 100644 index 00000000..b41f2f5d Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_White.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_White.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_White.png.meta new file mode 100644 index 00000000..5c09f650 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_White.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1d59fea183dad9049913c26dbc9000f7 +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: 95, y: 95, z: 95, w: 95} + 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/CornField/Reinforcement/ui_ComField_pop_title_logo.png b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_title_logo.png index 71753f88..ed7a8c11 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_title_logo.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_title_logo.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 54e8f504..bba99804 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -155,7 +155,7 @@ RectTransform: 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: 484} + m_AnchoredPosition: {x: 0, y: 499} m_SizeDelta: {x: 320, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &90350696 @@ -495,7 +495,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 28} - m_SizeDelta: {x: 1000, y: 1156} + m_SizeDelta: {x: 1000, y: 1200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &308891214 MonoBehaviour: @@ -651,11 +651,11 @@ RectTransform: - {fileID: 1440832244} - {fileID: 90350695} m_Father: {fileID: 884928058} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 27.999939} + m_AnchoredPosition: {x: 0, y: 31} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &698470368 @@ -698,6 +698,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 308891213} + - {fileID: 1977630791} - {fileID: 698470367} m_Father: {fileID: 2144327477} m_RootOrder: 0 @@ -743,7 +744,7 @@ RectTransform: 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: 0, y: 125} + m_AnchoredPosition: {x: 0, y: 97} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1440832245 @@ -900,6 +901,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720684618} m_CullTransparentMesh: 0 +--- !u!1 &1977630790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1977630791} + - component: {fileID: 1977630793} + - component: {fileID: 1977630792} + m_Layer: 5 + m_Name: Window_mat_White + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1977630791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977630790} + 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: 884928058} + 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: 55} + m_SizeDelta: {x: 930, y: 850} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1977630792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977630790} + 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: 1d59fea183dad9049913c26dbc9000f7, 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 &1977630793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977630790} + m_CullTransparentMesh: 0 --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0