From ac125afd001cd345cc1d62c3aa91f9b476302ce8 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 29 Oct 2021 11:43:30 +0900 Subject: [PATCH] =?UTF-8?q?=E8=B2=A9=E5=A3=B2=E3=82=B7=E3=83=BC=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E3=82=AB=E3=83=A1=E3=83=A9=E3=82=B5=E3=82=A4=E3=82=BA?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Prefabs/UICamera.prefab | 13 +++++++++++++ .../MyGame/Scenes/marketing/marketing.unity | 15 ++++++++++++++- .../Assets/MyGame/Scripts/CameraSizeChanger.cs | 3 +++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UICamera.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UICamera.prefab index 70e79bca..631c5e9a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UICamera.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UICamera.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 9117079084301130545} - component: {fileID: 9117079084301130544} + - component: {fileID: 8528884583953186477} m_Layer: 5 m_Name: UICamera m_TagString: Untagged @@ -74,3 +75,15 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!114 &8528884583953186477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9117079084301130547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index baed5571..30b9154e 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1064,6 +1064,7 @@ GameObject: - component: {fileID: 658354829} - component: {fileID: 658354828} - component: {fileID: 658354831} + - component: {fileID: 658354832} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1110,7 +1111,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 23 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -1152,6 +1153,18 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_MaxRayIntersections: 0 +--- !u!114 &658354832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658354827} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &658817260 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/CameraSizeChanger.cs b/popcorn/Assets/MyGame/Scripts/CameraSizeChanger.cs index f7a20060..9d65c1ab 100644 --- a/popcorn/Assets/MyGame/Scripts/CameraSizeChanger.cs +++ b/popcorn/Assets/MyGame/Scripts/CameraSizeChanger.cs @@ -33,6 +33,9 @@ namespace MyGame.Scripts case GameScenes.Main: camera.orthographicSize = 14f; break; + case GameScenes.marketing: + camera.orthographicSize = 13.5f; + break; } } }