Skip to content

Commit 34a9342

Browse files
committed
rescaled UI elements properly again
1 parent 0b55ef4 commit 34a9342

File tree

4 files changed

+45
-77
lines changed

4 files changed

+45
-77
lines changed

Assets/Scenes/InferenceScene.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3010,7 +3010,7 @@ RectTransform:
30103010
m_AnchorMin: {x: 0.5, y: 0.5}
30113011
m_AnchorMax: {x: 0.5, y: 0.5}
30123012
m_AnchoredPosition: {x: 0, y: 0}
3013-
m_SizeDelta: {x: 800, y: 395}
3013+
m_SizeDelta: {x: 800, y: 500}
30143014
m_Pivot: {x: 0.5, y: 0.5}
30153015
--- !u!114 &904577593
30163016
MonoBehaviour:

Assets/Scripts/Controller/CameraController.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,10 @@ void Update () {
5252
mounted = true;
5353
transform.position = player.transform.position + offset;
5454
}
55+
56+
if (Input.GetKeyDown(KeyCode.Escape))
57+
{
58+
Application.Quit();
59+
}
5560
}
5661
}

ProjectSettings/ProjectSettings.asset

Lines changed: 32 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ PlayerSettings:
6363
use32BitDisplayBuffer: 1
6464
preserveFramebufferAlpha: 0
6565
disableDepthAndStencilBuffers: 0
66+
androidStartInFullscreen: 1
67+
androidRenderOutsideSafeArea: 0
6668
androidBlitType: 0
6769
defaultIsNativeResolution: 1
6870
macRetinaSupport: 1
@@ -96,9 +98,6 @@ PlayerSettings:
9698
xboxEnableGuest: 0
9799
xboxEnablePIXSampling: 0
98100
metalFramebufferOnly: 0
99-
n3dsDisableStereoscopicView: 0
100-
n3dsEnableSharedListOpt: 1
101-
n3dsEnableVSync: 0
102101
xboxOneResolution: 0
103102
xboxOneSResolution: 0
104103
xboxOneXResolution: 3
@@ -107,11 +106,7 @@ PlayerSettings:
107106
xboxOneDisableEsram: 0
108107
xboxOnePresentImmediateThreshold: 0
109108
switchQueueCommandMemory: 0
110-
videoMemoryForVertexBuffers: 0
111-
psp2PowerMode: 0
112-
psp2AcquireBGM: 1
113109
vulkanEnableSetSRGBWrite: 0
114-
vulkanUseSWCommandBuffers: 0
115110
m_SupportedAspectRatios:
116111
4:3: 1
117112
5:4: 1
@@ -145,6 +140,7 @@ PlayerSettings:
145140
dashSupport: 0
146141
enable360StereoCapture: 0
147142
protectGraphicsMemory: 0
143+
enableFrameTimingStats: 0
148144
useHDRDisplay: 0
149145
m_ColorGamuts: 00000000
150146
targetPixelDensity: 30
@@ -169,7 +165,7 @@ PlayerSettings:
169165
StripUnusedMeshComponents: 1
170166
VertexChannelCompressionMask: 4054
171167
iPhoneSdkVersion: 988
172-
iOSTargetOSVersionString: 8.0
168+
iOSTargetOSVersionString: 9.0
173169
tvOSSdkVersion: 0
174170
tvOSRequireExtendedGameController: 0
175171
tvOSTargetOSVersionString: 9.0
@@ -235,7 +231,6 @@ PlayerSettings:
235231
appleEnableAutomaticSigning: 0
236232
iOSRequireARKit: 0
237233
appleEnableProMotion: 0
238-
vulkanEditorSupport: 0
239234
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
240235
templatePackageId: com.unity.3d@1.0.2
241236
templateDefaultScene: Assets/Scenes/SampleScene.unity
@@ -485,6 +480,7 @@ PlayerSettings:
485480
ps4pnGameCustomData: 1
486481
playerPrefsSupport: 0
487482
enableApplicationExit: 0
483+
resetTempFolder: 1
488484
restrictedAudioUsageRights: 0
489485
ps4UseResolutionFallback: 0
490486
ps4ReprojectionSupport: 0
@@ -508,53 +504,6 @@ PlayerSettings:
508504
ps4attribEyeToEyeDistanceSettingVR: 0
509505
ps4IncludedModules: []
510506
monoEnv:
511-
psp2Splashimage: {fileID: 0}
512-
psp2NPTrophyPackPath:
513-
psp2NPSupportGBMorGJP: 0
514-
psp2NPAgeRating: 12
515-
psp2NPTitleDatPath:
516-
psp2NPCommsID:
517-
psp2NPCommunicationsID:
518-
psp2NPCommsPassphrase:
519-
psp2NPCommsSig:
520-
psp2ParamSfxPath:
521-
psp2ManualPath:
522-
psp2LiveAreaGatePath:
523-
psp2LiveAreaBackroundPath:
524-
psp2LiveAreaPath:
525-
psp2LiveAreaTrialPath:
526-
psp2PatchChangeInfoPath:
527-
psp2PatchOriginalPackage:
528-
psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
529-
psp2KeystoneFile:
530-
psp2MemoryExpansionMode: 0
531-
psp2DRMType: 0
532-
psp2StorageType: 0
533-
psp2MediaCapacity: 0
534-
psp2DLCConfigPath:
535-
psp2ThumbnailPath:
536-
psp2BackgroundPath:
537-
psp2SoundPath:
538-
psp2TrophyCommId:
539-
psp2TrophyPackagePath:
540-
psp2PackagedResourcesPath:
541-
psp2SaveDataQuota: 10240
542-
psp2ParentalLevel: 1
543-
psp2ShortTitle: Not Set
544-
psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
545-
psp2Category: 0
546-
psp2MasterVersion: 01.00
547-
psp2AppVersion: 01.00
548-
psp2TVBootMode: 0
549-
psp2EnterButtonAssignment: 2
550-
psp2TVDisableEmu: 0
551-
psp2AllowTwitterDialog: 1
552-
psp2Upgradable: 0
553-
psp2HealthWarning: 0
554-
psp2UseLibLocation: 0
555-
psp2InfoBarOnStartup: 0
556-
psp2InfoBarColor: 0
557-
psp2ScriptOptimizationLevel: 0
558507
splashScreenBackgroundSourceLandscape: {fileID: 0}
559508
splashScreenBackgroundSourcePortrait: {fileID: 0}
560509
spritePackerPolicy:
@@ -570,10 +519,12 @@ PlayerSettings:
570519
webGLUseEmbeddedResources: 0
571520
webGLCompressionFormat: 1
572521
webGLLinkerTarget: 1
522+
webGLThreadsSupport: 0
573523
scriptingDefineSymbols: {}
574524
platformArchitecture: {}
575525
scriptingBackend: {}
576526
il2cppCompilerConfiguration: {}
527+
managedStrippingLevel: {}
577528
incrementalIl2cppBuild: {}
578529
allowUnsafeCode: 0
579530
additionalIl2CppArgs:
@@ -596,28 +547,20 @@ PlayerSettings:
596547
metroMediumTileShowName: 0
597548
metroLargeTileShowName: 0
598549
metroWideTileShowName: 0
550+
metroSupportStreamingInstall: 0
551+
metroLastRequiredScene: 0
599552
metroDefaultTileSize: 1
600553
metroTileForegroundText: 2
601554
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
602555
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
603556
a: 1}
604557
metroSplashScreenUseBackgroundColor: 0
605558
platformCapabilities: {}
559+
metroTargetDeviceFamilies: {}
606560
metroFTAName:
607561
metroFTAFileTypes: []
608562
metroProtocolName:
609563
metroCompilationOverrides: 1
610-
n3dsUseExtSaveData: 0
611-
n3dsCompressStaticMem: 1
612-
n3dsExtSaveDataNumber: 0x12345
613-
n3dsStackSize: 131072
614-
n3dsTargetPlatform: 2
615-
n3dsRegion: 7
616-
n3dsMediaSize: 0
617-
n3dsLogoStyle: 3
618-
n3dsTitle: GameName
619-
n3dsProductCode:
620-
n3dsApplicationId: 0xFF3FF
621564
XboxOneProductId:
622565
XboxOneUpdateKey:
623566
XboxOneSandboxId:
@@ -643,18 +586,38 @@ PlayerSettings:
643586
XboxOnePersistentLocalStorageSize: 0
644587
XboxOneXTitleMemory: 8
645588
xboxOneScriptCompiler: 0
589+
XboxOneOverrideIdentityName:
646590
vrEditorSettings:
647591
daydream:
648592
daydreamIconForeground: {fileID: 0}
649593
daydreamIconBackground: {fileID: 0}
650594
cloudServicesEnabled:
651595
Build: 0
652596
UNet: 1
597+
luminIcon:
598+
m_Name:
599+
m_ModelFolderPath:
600+
m_PortalFolderPath:
601+
luminCert:
602+
m_CertPath:
603+
m_PrivateKeyPath:
604+
luminIsChannelApp: 0
605+
luminVersion:
606+
m_VersionCode: 1
607+
m_VersionName:
653608
facebookSdkVersion: 7.9.4
609+
facebookAppId:
610+
facebookCookies: 1
611+
facebookLogging: 1
612+
facebookStatus: 1
613+
facebookXfbml: 0
614+
facebookFrictionlessRequests: 1
654615
apiCompatibilityLevel: 3
655-
cloudProjectId: 6809fbf0-eeb4-48ca-bfe2-c0de6cc4af28
616+
cloudProjectId: 832d65eb-5337-490f-afa9-1f2c89f317a6
617+
framebufferDepthMemorylessMode: 0
656618
projectName: StateRepresentation
657-
organizationId: kcolyhs
619+
organizationId: chris-gong
658620
cloudEnabled: 0
659621
enableNativePlatformBackendsForNewInputSystem: 0
660622
disableOldInputManagerSupport: 0
623+
legacyClampBlendShapeWeights: 1

ProjectSettings/UnityConnectSettings.asset

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
--- !u!310 &1
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
6+
serializedVersion: 1
67
m_Enabled: 1
78
m_TestMode: 0
8-
m_TestEventUrl:
9-
m_TestConfigUrl:
9+
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
10+
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
11+
m_ConfigUrl: https://config.uca.cloud.unity3d.com
1012
m_TestInitMode: 0
1113
CrashReportingSettings:
12-
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
13-
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
14+
m_EventUrl: https://perf-events.cloud.unity3d.com
1415
m_Enabled: 1
16+
m_LogBufferSize: 10
1517
m_CaptureEditorExceptions: 1
1618
UnityPurchasingSettings:
1719
m_Enabled: 0
1820
m_TestMode: 0
1921
UnityAnalyticsSettings:
2022
m_Enabled: 1
21-
m_InitializeOnStartup: 1
2223
m_TestMode: 0
23-
m_TestEventUrl:
24-
m_TestConfigUrl:
24+
m_InitializeOnStartup: 1
2525
UnityAdsSettings:
2626
m_Enabled: 0
2727
m_InitializeOnStartup: 1

0 commit comments

Comments
 (0)