diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png index 1025c999..c9643cd2 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_background_up_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_balloon_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_balloon_Dither.png new file mode 100644 index 00000000..f995e3de Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_balloon_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_balloon_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_balloon_Dither.png.meta new file mode 100644 index 00000000..99080f82 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_balloon_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 80a90fa5006a51a4f9d724790964c973 +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/marketing/ui_marketing_StockMeter.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png new file mode 100644 index 00000000..0389f427 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_StocktText.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_StocktText.png new file mode 100644 index 00000000..9abedec5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_StocktText.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_StocktText.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_StocktText.png.meta new file mode 100644 index 00000000..8a59f0b1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_StocktText.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d2e4ae50bfa33574dbf61988d91f2634 +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/UI/ui_marketing_StockMeter_a.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_a.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_a.png rename to popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_a.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_a.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_a.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_a.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png new file mode 100644 index 00000000..2f5d2495 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png.meta new file mode 100644 index 00000000..25dbecec --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 39338f73bd1e4f443958fdf6e03d345b +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/marketing/ui_marketing_StockMeter_fill.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_fill.png new file mode 100644 index 00000000..98a845f5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_fill.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_fill.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_fill.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_mask.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_mask.png new file mode 100644 index 00000000..fa52239d Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_mask.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_mask.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_mask.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_mask.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_mask.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter.png b/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter.png deleted file mode 100644 index 0da1d7eb..00000000 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png b/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png deleted file mode 100644 index 291d4d9b..00000000 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_fill.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_mask.png b/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_mask.png deleted file mode 100644 index c8ae1722..00000000 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_StockMeter_mask.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index c8fc5cd6..161f9c8c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -146,7 +146,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53013340} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0029997826, y: 0.5, z: 0} + m_LocalPosition: {x: 0, y: 0.45, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 438315599} @@ -190,7 +190,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 3 m_Sprite: {fileID: 21300000, guid: d41bf807beddb4349bafd176c9047383, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -618,11 +618,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220821819} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.06, z: 0} + m_LocalPosition: {x: -0.03, y: 1.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2048621275} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &220821821 SpriteRenderer: @@ -761,87 +761,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4a8efaaa187d4865a1b4cabfa40ab6e9, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &240851456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 240851457} - - component: {fileID: 240851458} - m_Layer: 0 - m_Name: Body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &240851457 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240851456} - 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: 1280903571} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &240851458 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240851456} - 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: 4 - m_Sprite: {fileID: 21300000, guid: b16c2507612b44542b24ed5645dbee09, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 6.14, y: 7.6} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &286834611 GameObject: m_ObjectHideFlags: 0 @@ -977,14 +896,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 438315598} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.16, y: -0.16, z: 0} + m_LocalPosition: {x: 3.82, y: -2.45, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 699827849} - {fileID: 1806801955} - {fileID: 53013341} + - {fileID: 456610255} m_Father: {fileID: 1280903571} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &438315600 SpriteRenderer: @@ -1024,7 +944,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: 19e47aa2657cc1f47adfca0ad007a309, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1051,6 +971,87 @@ MonoBehaviour: popcornImage: {fileID: 53013342} maxPosision: 0.5 minPosision: -1.47 +--- !u!1 &456610254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 456610255} + - component: {fileID: 456610256} + m_Layer: 0 + m_Name: StockMeter_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &456610255 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456610254} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.036, y: 0.62, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 438315599} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &456610256 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456610254} + 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: 2 + m_Sprite: {fileID: 21300000, guid: 39338f73bd1e4f443958fdf6e03d345b, 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.72, y: 2.62} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &658354827 GameObject: m_ObjectHideFlags: 0 @@ -1261,7 +1262,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 658817260} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1717315656} @@ -1530,8 +1531,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 699827848} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.0046, y: 0.4006, z: 0} - m_LocalScale: {x: 0.7219189, y: 1.767472, z: 1} + m_LocalPosition: {x: 0.0046, y: 0.356, z: 0} + m_LocalScale: {x: 1.52, y: 1.62, z: 1} m_Children: [] m_Father: {fileID: 438315599} m_RootOrder: 0 @@ -2766,6 +2767,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1044373331} m_PrefabAsset: {fileID: 0} +--- !u!1 &1064237505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1064237506} + - component: {fileID: 1064237507} + m_Layer: 0 + m_Name: balloon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1064237506 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064237505} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.5, y: 4.79, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2048621275} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1064237507 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064237505} + 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: 4 + m_Sprite: {fileID: 21300000, guid: 80a90fa5006a51a4f9d724790964c973, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.16, y: 3.78} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1075915152 PrefabInstance: m_ObjectHideFlags: 0 @@ -2983,7 +3065,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1165998903} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.13, y: 0.16, z: 0} + m_LocalPosition: {x: 4.05, y: -0.18, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1102296790} @@ -3195,7 +3277,7 @@ Transform: m_Children: - {fileID: 668553843} m_Father: {fileID: 2048621275} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1199276396 Animator: @@ -3315,10 +3397,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280903570} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.67, y: 3.51, z: 0} + m_LocalPosition: {x: -6.67, y: 3.724, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - - {fileID: 240851457} - {fileID: 438315599} m_Father: {fileID: 2031857954} m_RootOrder: 1 @@ -3508,7 +3589,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2048621275} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1482901212 SpriteRenderer: @@ -3660,7 +3741,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506158579} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.38, z: 0} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 1178501604} @@ -4353,7 +4434,7 @@ GameObject: - component: {fileID: 1806801955} - component: {fileID: 1806801956} m_Layer: 0 - m_Name: StockMeter_a + m_Name: StocktText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4367,7 +4448,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806801954} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.114, y: 1.02, z: 0} + m_LocalPosition: {x: -0.114, y: -0.949, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 438315599} @@ -4412,7 +4493,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: 12ff7a9ae6afc304796ab2f4ebf7f05d, type: 3} + m_Sprite: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -4744,9 +4825,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2048621274} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.214, z: 0} + m_LocalPosition: {x: 0, y: 0.83399993, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1064237506} - {fileID: 1482901211} - {fileID: 220821820} - {fileID: 2104509456} @@ -9805,7 +9887,7 @@ Transform: - {fileID: 58426211} - {fileID: 2050100490} m_Father: {fileID: 2048621275} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2724256641515514847 PrefabInstance: