diff --git a/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset b/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset index 91672055..a9fa9b95 100644 --- a/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset +++ b/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset @@ -2685,10 +2685,10 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 1 + - _OutlineWidth: 0.7 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.4528302 + - _ScaleRatioA: 0.53333336 - _ScaleRatioB: 0.011250019 - _ScaleRatioC: 0.011250019 - _ScaleX: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index c515171c..07ca9fe4 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -2448,6 +2448,151 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &737572414 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 974444275} + m_Modifications: + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 122 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 76 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Name + value: icon_get + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} +--- !u!224 &737572415 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 737572414} + m_PrefabAsset: {fileID: 0} --- !u!1 &769574933 GameObject: m_ObjectHideFlags: 0 @@ -2881,6 +3026,7 @@ RectTransform: m_Children: - {fileID: 656762353} - {fileID: 1129787250} + - {fileID: 737572415} m_Father: {fileID: 1735316555} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 047a0044..9eb59f4d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -899,7 +899,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: 234} + m_AnchoredPosition: {x: 0, y: 295} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7547632996551671085 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index 98332b54..d51a2242 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -1748,6 +1748,7 @@ GameObject: - component: {fileID: 8175998082998279045} - component: {fileID: 8175998082998279046} - component: {fileID: 8175998082998279047} + - component: {fileID: 8037923969095888399} m_Layer: 5 m_Name: Button_detail m_TagString: Untagged @@ -1854,6 +1855,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &8037923969095888399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8175998082998279041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &8175998083146003103 GameObject: m_ObjectHideFlags: 0