diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter.png index 402bfb4f..5ef96366 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png new file mode 100644 index 00000000..a71e7022 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png.meta new file mode 100644 index 00000000..cee43189 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Main_StockMeter_Unreleased.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 36643079270930d4e810030325a8c460 +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/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 0d4d6b31..f2b1046a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -228,6 +228,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1796633949} + - {fileID: 1187654216} m_Father: {fileID: 2082561918} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -281,6 +282,231 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &609410911 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} +--- !u!4 &609410912 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 609410911} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1042957342 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.4 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} +--- !u!4 &1042957343 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1042957342} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1076949532 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.2 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} +--- !u!4 &1076949533 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1076949532} + m_PrefabAsset: {fileID: 0} --- !u!1 &1122085163 GameObject: m_ObjectHideFlags: 0 @@ -389,6 +615,198 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 2.56, y: 2.24} m_EdgeRadius: 0 +--- !u!1001 &1153742598 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} +--- !u!4 &1153742599 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1153742598} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1187654215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187654216} + m_Layer: 0 + m_Name: StockMeter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1187654216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187654215} + 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: 1916097752} + - {fileID: 1914907654} + - {fileID: 1042957343} + - {fileID: 1153742599} + - {fileID: 609410912} + - {fileID: 1298499618} + - {fileID: 1076949533} + m_Father: {fileID: 590848657} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -1.45} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1298499617 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.8 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} +--- !u!4 &1298499618 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1298499617} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1328732174 PrefabInstance: m_ObjectHideFlags: 0 @@ -680,6 +1098,87 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1914907653 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.8 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} +--- !u!4 &1914907654 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1914907653} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1916097752 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 3665723643790057849} + m_PrefabAsset: {fileID: 0} --- !u!1 &2001111209 GameObject: m_ObjectHideFlags: 0 @@ -1322,6 +1821,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} +--- !u!1001 &3665723643790057849 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1187654216} + m_Modifications: + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.2 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_Name + value: Meter + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} --- !u!1001 &3915769149207111994 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab new file mode 100644 index 00000000..7f0b49e6 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2400848238848264989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2127467310855589365} + - component: {fileID: 8901195797687025316} + m_Layer: 0 + m_Name: StockMeter_fil + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2127467310855589365 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2400848238848264989} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.163, 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!212 &8901195797687025316 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2400848238848264989} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 12 + m_Sprite: {fileID: 21300000, guid: 82fbd0355b7ba384fafa6a666a836f41, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.06, y: 1.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3072131335653526340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2841037966060807605} + m_Layer: 0 + m_Name: Unreleased + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2841037966060807605 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072131335653526340} + 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: 93137573598362215} + m_Father: {fileID: 3665723641945798049} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3665723641945798062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3665723641945798049} + m_Layer: 0 + m_Name: Meter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3665723641945798049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3665723641945798062} + 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: 2841037966060807605} + - {fileID: 4798599775605052312} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3665723643188271317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3665723643188271316} + - component: {fileID: 3665723643188271319} + m_Layer: 0 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3665723643188271316 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3665723643188271317} + 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: 4798599775605052312} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3665723643188271319 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3665723643188271317} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_Sprite: {fileID: 21300000, guid: bcffb0611fccd6940a1049ad84be58cc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.28, y: 1.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3820200108498807071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 93137573598362215} + - component: {fileID: 2350286456009609737} + m_Layer: 0 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &93137573598362215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820200108498807071} + 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: 2841037966060807605} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2350286456009609737 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820200108498807071} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 14 + m_Sprite: {fileID: 21300000, guid: 36643079270930d4e810030325a8c460, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.28, y: 1.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8231967146614545174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 599489329584271214} + - component: {fileID: 7256586688983144782} + m_Layer: 0 + m_Name: StockMeter_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &599489329584271214 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4798599775605052312} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7256586688983144782 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8231967146614545174} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 13 + m_Sprite: {fileID: 21300000, guid: 629b0d2aa10eec54abac57f26f1b16eb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.38, y: 0.4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8702861416257428021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4798599775605052312} + m_Layer: 0 + m_Name: tank + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4798599775605052312 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702861416257428021} + 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: 3665723643188271316} + - {fileID: 2127467310855589365} + - {fileID: 599489329584271214} + m_Father: {fileID: 3665723641945798049} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab.meta b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab.meta new file mode 100644 index 00000000..00a6411a --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 72166b54c2bb0ff49aa3ae7dc7e78f82 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: