diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_SanFrancisco_desk_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_SanFrancisco_desk_Dither.png index fc3b13d6..d3ccaca0 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_SanFrancisco_desk_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_background_SanFrancisco_desk_Dither.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index dc376204..0e67465a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -124,6 +124,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &8437075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1821652566} --- !u!1 &17725291 GameObject: m_ObjectHideFlags: 0 @@ -3559,7 +3572,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &876594163 Transform: m_ObjectHideFlags: 0 @@ -6039,7 +6052,7 @@ MonoBehaviour: mGUI_ShowReferences: 0 mGUI_ShowTems: 1 mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 0} + mLocalizeTarget: {fileID: 8437075} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &1823553374 GameObject: @@ -7734,7 +7747,7 @@ PrefabInstance: - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index f43c66a2..3b1fea49 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -2482,10 +2482,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: button: {fileID: 7557289802969012155} - phoneAnimator: {fileID: 0} - indicatorAnimator: {fileID: 0} - titleObject: {fileID: 4137423837908745802} - balloonObject: {fileID: 0} completedBadgeObject: {fileID: 7803003898279553472} --- !u!1 &6276279722976275712 GameObject: @@ -5022,7 +5018,7 @@ PrefabInstance: - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} propertyPath: m_AnchoredPosition.x - value: -120 + value: -109 objectReference: {fileID: 0} - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3}