Fix scaling issue

daniel-keogh · Mar 21, 2021 · 6461cd4 · 6461cd4
1 parent 5cbaa99
commit 6461cd4
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 207 deletions.
diff --git a/Assets/Prefab/UI/Canvas/GameCanvas.prefab b/Assets/Prefab/UI/Canvas/GameCanvas.prefab
@@ -1790,8 +1790,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   answerValue: 3
   finalAnswerClip: {fileID: 8300000, guid: 4aff204c4e728a642862a956a1ec6f81, type: 3}
-  answerText: {fileID: 620154996829088885}
   letterText: {fileID: 1640079777}
+  answerText: {fileID: 620154996829088885}
+  answerSelectedStatus: Is that your final answer?
   selectedBackground: {fileID: 620154997175591353}
   answerBackground: {fileID: 620154997678962686}
 --- !u!222 &4004163748341445138
@@ -1836,7 +1837,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -474.94135}
+  m_AnchoredPosition: {x: 0, y: -475}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &620154996665488071
@@ -1913,7 +1914,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -39.99994}
+  m_AnchoredPosition: {x: 0, y: -40}
   m_SizeDelta: {x: 385, y: -80}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &935250951
@@ -2183,8 +2184,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   answerValue: 1
   finalAnswerClip: {fileID: 8300000, guid: 4aff204c4e728a642862a956a1ec6f81, type: 3}
-  answerText: {fileID: 620154998627146843}
   letterText: {fileID: 1762819046}
+  answerText: {fileID: 620154998627146843}
+  answerSelectedStatus: Is that your final answer?
   selectedBackground: {fileID: 620154997436755031}
   answerBackground: {fileID: 620154998018410523}
 --- !u!222 &4466060262873754087
@@ -2858,8 +2860,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   answerValue: 2
   finalAnswerClip: {fileID: 8300000, guid: 4aff204c4e728a642862a956a1ec6f81, type: 3}
-  answerText: {fileID: 620154996842851604}
   letterText: {fileID: 97352399}
+  answerText: {fileID: 620154996842851604}
+  answerSelectedStatus: Is that your final answer?
   selectedBackground: {fileID: 620154998346834866}
   answerBackground: {fileID: 620154997014042644}
 --- !u!222 &6563265792875970290
@@ -3033,10 +3036,10 @@ RectTransform:
   m_Father: {fileID: 620154997966464350}
   m_RootOrder: 0
   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: 0, y: 0}
-  m_SizeDelta: {x: 965, y: 120.00001}
+  m_SizeDelta: {x: -571, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &620154997028633450
 CanvasRenderer:
@@ -4215,8 +4218,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 620154996557938822}
   m_HandleRect: {fileID: 620154996557938821}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 0.9846447
+  m_Value: 1
+  m_Size: 0.99995184
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -4365,8 +4368,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   answerValue: 0
   finalAnswerClip: {fileID: 8300000, guid: 4aff204c4e728a642862a956a1ec6f81, type: 3}
-  answerText: {fileID: 620154996558698444}
   letterText: {fileID: 2009063144}
+  answerText: {fileID: 620154996558698444}
+  answerSelectedStatus: Is that your final answer?
   selectedBackground: {fileID: 620154998531100746}
   answerBackground: {fileID: 620154997269114533}
 --- !u!222 &5641729750559374898

diff --git a/Assets/WSATestCertificate.pfx b/Assets/WSATestCertificate.pfx
diff --git a/Assets/__Scenes/GameScene.unity b/Assets/__Scenes/GameScene.unity
@@ -133,48 +133,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 216ad32d7e617f64992d52676664f3d0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!28 &284980363
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 1
-  m_Height: 2
-  m_CompleteImageSize: 12
-  m_TextureFormat: 4
-  m_MipCount: 2
-  m_IsReadable: 1
-  m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 1
-    m_WrapV: 1
-    m_WrapW: 1
-  m_LightmapFormat: 0
-  m_ColorSpace: 0
-  image data: 12
-  _typelessdata: 524abaff0a1c6aff2e3392ff
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &519420028
 GameObject:
   m_ObjectHideFlags: 0
@@ -580,6 +538,48 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!28 &1844036281
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 1
+  m_Height: 2
+  m_CompleteImageSize: 12
+  m_TextureFormat: 4
+  m_MipCount: 2
+  m_IsReadable: 1
+  m_IgnoreMasterTextureLimit: 0
+  m_IsPreProcessed: 0
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_LightmapFormat: 0
+  m_ColorSpace: 0
+  image data: 12
+  _typelessdata: 524abaff0a1c6aff2e3392ff
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!28 &1976412059
 Texture2D:
   m_ObjectHideFlags: 0
@@ -788,26 +788,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1369675271}
     m_Modifications:
-    - target: {fileID: 569177120, guid: 901a05789d919fa44bfb8f7ae0437bf7, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 569177120, guid: 901a05789d919fa44bfb8f7ae0437bf7, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 569177120, guid: 901a05789d919fa44bfb8f7ae0437bf7, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 569177120, guid: 901a05789d919fa44bfb8f7ae0437bf7, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 569177120, guid: 901a05789d919fa44bfb8f7ae0437bf7, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 575731580025931887, guid: 901a05789d919fa44bfb8f7ae0437bf7,
         type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -823,55 +803,15 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 620154996665488070, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -474.9415
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996770834440, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996770834440, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996770834440, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996891185969, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996891185969, guid: 901a05789d919fa44bfb8f7ae0437bf7,
+    - target: {fileID: 620154996557938821, guid: 901a05789d919fa44bfb8f7ae0437bf7,
         type: 3}
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 620154996891185969, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996891185969, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996891185969, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154996891185969, guid: 901a05789d919fa44bfb8f7ae0437bf7,
+    - target: {fileID: 620154996665488070, guid: 901a05789d919fa44bfb8f7ae0437bf7,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -475
       objectReference: {fileID: 0}
     - target: {fileID: 620154997528853530, guid: 901a05789d919fa44bfb8f7ae0437bf7,
         type: 3}
@@ -983,101 +923,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 620154997640883182, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154997640883182, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154997640883182, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154997640883182, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154997640883182, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154997640883182, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154998452605279, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154998452605279, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154998452605279, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154998452605279, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154998452605279, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 620154998452605279, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 1502534946969757360, guid: 901a05789d919fa44bfb8f7ae0437bf7,
         type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
       objectReference: {fileID: 1389829919}
-    - target: {fileID: 1502534946969757361, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502534946969757361, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502534946969757361, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502534946969757361, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502534946969757361, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502534946969757361, guid: 901a05789d919fa44bfb8f7ae0437bf7,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 901a05789d919fa44bfb8f7ae0437bf7, type: 3}
 --- !u!114 &620154998540264517 stripped

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -567,7 +567,7 @@ PlayerSettings:
   metroCertificatePassword: 
   metroCertificateSubject: DefaultCompany
   metroCertificateIssuer: DefaultCompany
-  metroCertificateNotAfter: 80e91fd17636d801
+  metroCertificateNotAfter: 80d8691d9f3dd801
   metroApplicationDescription: Template_2D
   wsaImages: {}
   metroTileShortName: wwtbam