diff --git a/popcorn/Assets/MyGame/Resource/Material/WorldMap/ui_Main_WorldMap_release_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/WorldMap/ui_Main_WorldMap_release_background_Dither.png new file mode 100644 index 00000000..eeb7d7a0 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/WorldMap/ui_Main_WorldMap_release_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/WorldMap/ui_Main_WorldMap_release_background_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/WorldMap/ui_Main_WorldMap_release_background_Dither.png.meta new file mode 100644 index 00000000..47ca3082 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/WorldMap/ui_Main_WorldMap_release_background_Dither.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 85455daf657f69e45bf4b47881568659 +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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity index 4bc2b8e5..446003a2 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity @@ -123,6 +123,97 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &91555126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 91555127} + - component: {fileID: 91555130} + - component: {fileID: 91555129} + - component: {fileID: 91555128} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &91555127 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91555126} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 6, y: 6, z: 6} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1002606734} + m_Father: {fileID: 9205686915316991930} + 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: -42} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &91555128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91555126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &91555129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91555126} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2e124af6eaea54b0ab5378b97039ad76, 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 &91555130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91555126} + m_CullTransparentMesh: 1 --- !u!1 &340488688 GameObject: m_ObjectHideFlags: 0 @@ -242,6 +333,96 @@ Camera: type: 3} m_PrefabInstance: {fileID: 952870153} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1002606733 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 91555127} + m_Modifications: + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalScale.x + value: 7.0769224 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalScale.y + value: 7.0769224 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalScale.z + value: 7.0769224 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalPosition.y + value: -35.835384 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6725113438918222138, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_Name + value: marketing + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} +--- !u!4 &1002606734 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + m_PrefabInstance: {fileID: 1002606733} + m_PrefabAsset: {fileID: 0} --- !u!114 &1236271309 MonoBehaviour: m_ObjectHideFlags: 0 @@ -625,7 +806,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9205686915316991930} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!199 &9205686914215368577 ParticleSystemRenderer: @@ -5790,6 +5971,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9205686915428819905} + - {fileID: 91555127} - {fileID: 9205686915555986282} - {fileID: 9205686914215368576} m_Father: {fileID: 9205686914717556668} @@ -5858,7 +6040,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9f182973bce4ee4eb8c57960f9696d1, type: 3} + m_Sprite: {fileID: 21300000, guid: 85455daf657f69e45bf4b47881568659, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5907,7 +6089,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9205686915316991930} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}