From 7febc4339f4cc5810baee8c7e802ee0d11067dac Mon Sep 17 00:00:00 2001 From: Firerise9402 <90978630+Firerise9402@users.noreply.github.com> Date: Thu, 24 Aug 2023 11:56:56 -0400 Subject: [PATCH] fixed everything --- Assets/Scenes/Editor.unity | 6 +++--- Assets/Scripts/StaticCamera.cs | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index fcae98e41..a7bf66119 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -20150,7 +20150,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -23676,7 +23676,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -408.97968, y: -17} + m_AnchoredPosition: {x: -408.97974, y: -17} m_SizeDelta: {x: -817.96, y: -46.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1112762038 stripped @@ -24848,7 +24848,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 117.31038} + m_AnchoredPosition: {x: 0, y: 118.41051} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 diff --git a/Assets/Scripts/StaticCamera.cs b/Assets/Scripts/StaticCamera.cs index 50096cad1..b4f7cf6f9 100644 --- a/Assets/Scripts/StaticCamera.cs +++ b/Assets/Scripts/StaticCamera.cs @@ -24,7 +24,6 @@ namespace HeavenStudio [SerializeField] GameObject letterboxBgGO; [SerializeField] RectTransform letterboxMask; [SerializeField] RawImage viewportTexture; - //[SerializeField] RawImage overlayTexture; public static StaticCamera instance { get; private set; } public new Camera camera; @@ -137,7 +136,6 @@ namespace HeavenStudio canvas.localPosition = pan; canvas.eulerAngles = new Vector3(0, 0, rotation); - //letterboxMask.localScale = letterbox; if(fitToScreen) { letterboxMask.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1); @@ -150,8 +148,7 @@ namespace HeavenStudio overlayCanvas.localScale = new Vector3(1, 1, 1); } canvas.localScale = scale; - //viewportTexture.uvRect = new Rect(tilePan.x, tilePan.y, screenTile.x, screenTile.y); - //overlayTexture.uvRect = new Rect(tilePan.x, tilePan.y, screenTile.x, screenTile.y); + viewportTexture.uvRect = new Rect(tilePan.x, tilePan.y, screenTile.x, screenTile.y); } private void UpdatePan()