diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png index 75329282..2287abcb 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png index 041542a0..962943fc 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index d2fc4b5d..f9c23ad1 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -960,7 +960,7 @@ PrefabInstance: type: 3} - target: {fileID: 1823819594, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1823819596, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Maskable diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index f5d3c4f2..625b33c6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -185,10 +185,10 @@ RectTransform: m_Father: {fileID: 3664916832844628215} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 373, y: -203} - m_SizeDelta: {x: 237.56934, y: 125.794174} + m_SizeDelta: {x: -782.43066, y: 125.79419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6119163445458718855 MonoBehaviour: @@ -698,7 +698,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1823819595 RectTransform: m_ObjectHideFlags: 0 @@ -1008,7 +1008,7 @@ RectTransform: m_GameObject: {fileID: 566248750470715636} 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_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: - {fileID: 4146400484972392966} - {fileID: 2609057251471961254} @@ -1414,7 +1414,7 @@ RectTransform: m_GameObject: {fileID: 2835369144934501534} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 655651630893765691} - {fileID: 8136363072906095234} @@ -2549,7 +2549,7 @@ RectTransform: m_GameObject: {fileID: 8559323780514547720} 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_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: - {fileID: 3731750983233236168} - {fileID: 8216095361509793363} @@ -2605,6 +2605,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3664916832844628215} m_Modifications: + - target: {fileID: 3310671341034218321, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -535.10156 + objectReference: {fileID: 0} + - target: {fileID: 3310671341034218321, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.70312 + objectReference: {fileID: 0} - target: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_Name @@ -2720,20 +2730,40 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3310671341662576994, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -355.19922 + objectReference: {fileID: 0} + - target: {fileID: 3310671341662576994, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.70312 + objectReference: {fileID: 0} + - target: {fileID: 3310671341763054132, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.70312 + objectReference: {fileID: 0} + - target: {fileID: 9193060593438266932, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.70312 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} ---- !u!1 &3664916833752817996 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, - type: 3} - m_PrefabInstance: {fileID: 2246654624185019878} - m_PrefabAsset: {fileID: 0} --- !u!224 &3664916833752817997 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} m_PrefabInstance: {fileID: 2246654624185019878} m_PrefabAsset: {fileID: 0} +--- !u!1 &3664916833752817996 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + m_PrefabInstance: {fileID: 2246654624185019878} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3691625806369805098 PrefabInstance: m_ObjectHideFlags: 0 @@ -2929,18 +2959,18 @@ PrefabInstance: objectReference: {fileID: 3664916832844628215} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} ---- !u!1 &3664916834242367712 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, - type: 3} - m_PrefabInstance: {fileID: 3691625806369805098} - m_PrefabAsset: {fileID: 0} --- !u!224 &3664916834242367713 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabAsset: {fileID: 0} +--- !u!1 &3664916834242367712 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, + type: 3} + m_PrefabInstance: {fileID: 3691625806369805098} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7577981076568039546 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 5bc1600a..394b3e34 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1627,21 +1627,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_LocalScale.x - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_LocalScale.y - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_LocalScale.z - value: 0.9 - objectReference: {fileID: 0} - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_fontColor.a @@ -1977,6 +1962,16 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder