From cca76b6f044c06d53d8a68c7159a8d76487fa190 Mon Sep 17 00:00:00 2001 From: Dmitri Kolytchev Date: Sun, 31 Jan 2016 13:47:54 -0500 Subject: [PATCH] more GUI tweaks --- Assets/scenes/GameplayScene.unity | 9 +++- Assets/scripts/GUIGameplay.cs | 8 +-- ProjectSettings/ProjectSettings.asset | 72 +-------------------------- 3 files changed, 13 insertions(+), 76 deletions(-) diff --git a/Assets/scenes/GameplayScene.unity b/Assets/scenes/GameplayScene.unity index 505303c..d42e8d9 100644 --- a/Assets/scenes/GameplayScene.unity +++ b/Assets/scenes/GameplayScene.unity @@ -65,7 +65,6 @@ LightmapSettings: m_TextureCompression: 1 m_FinalGather: 0 m_FinalGatherRayCount: 1024 - m_ReflectionCompression: 2 m_LightmapSnapshot: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &4 @@ -85,6 +84,9 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!127 &5 +LevelGameManager: + m_ObjectHideFlags: 0 --- !u!1 &16934334 GameObject: m_ObjectHideFlags: 0 @@ -501,7 +503,6 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 - m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -614,6 +615,10 @@ Prefab: propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} + - target: {fileID: 11451600, guid: 10be2fb46e4285942b2957ae293fd714, type: 2} + propertyPath: offset + value: 70 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 10be2fb46e4285942b2957ae293fd714, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/scripts/GUIGameplay.cs b/Assets/scripts/GUIGameplay.cs index 8f58ed8..59adb98 100644 --- a/Assets/scripts/GUIGameplay.cs +++ b/Assets/scripts/GUIGameplay.cs @@ -2,8 +2,8 @@ using System.Collections; public class GUIGameplay : MonoBehaviour { - public const int boxHeight=90,boxWidth=50; - public const int offset = 10; + public const int boxHeight=90,boxWidth=70; + public int offset = 10; // Use this for initialization void Start () { @@ -41,8 +41,8 @@ public class GUIGameplay : MonoBehaviour { break; } //beardTex.Resize(10, 10); - int offset = (int)((Screen.width - 3 * boxWidth) / 5f); - x = (int) (((Screen.width - boxWidth*3) / 3 * (1+1/6) * i) + (Screen.width - boxWidth*3)/6); + //int offset = (int)((Screen.width - 3 * boxWidth) / 5f); + x = (int) (offset + Screen.width / 3 * i); GUI.Box(new Rect(x , 0, boxWidth, 90), beardTex, boxStyle); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c8b6db5..b8902bf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,7 +8,6 @@ PlayerSettings: defaultScreenOrientation: 4 targetDevice: 2 targetResolution: 0 - useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: GameJamProject @@ -29,7 +28,6 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -62,23 +60,11 @@ PlayerSettings: xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 xboxOneResolution: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 - wiiUTVResolution: 0 - wiiUGamePadMSAA: 1 - wiiUSupportsNunchuk: 0 - wiiUSupportsClassicController: 0 - wiiUSupportsBalanceBoard: 0 - wiiUSupportsMotionPlus: 0 - wiiUSupportsProController: 0 - wiiUAllowScreenCapture: 1 - wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -91,26 +77,20 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 productGUID: dbca7936984e94248bf9f90833bc0c3a AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 aotOptions: apiCompatibilityLevel: 2 - stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: - serializedVersion: 2 - m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 @@ -137,15 +117,6 @@ PlayerSettings: iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -165,23 +136,6 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} - wiiUTitleID: 0005000011000000 - wiiUGroupID: 00010000 - wiiUCommonSaveSize: 4096 - wiiUAccountSaveSize: 2048 - wiiUOlvAccessKey: 0 - wiiUTinCode: 0 - wiiUJoinGameId: 0 - wiiUJoinGameModeMask: 0000000000000000 - wiiUCommonBossSize: 0 - wiiUAccountBossSize: 0 - wiiUAddOnUniqueIDs: [] - wiiUMainThreadStackSize: 3072 - wiiULoaderThreadStackSize: 1024 - wiiUSystemHeapSize: 128 - wiiUTVStartupScreen: {fileID: 0} - wiiUGamePadStartupScreen: {fileID: 0} - wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -232,20 +186,15 @@ PlayerSettings: ps4BackgroundImagePath: ps4StartupImagePath: ps4SaveDataImagePath: - ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4Passcode: 3mJ7tLHOsT9jNvqC8LNjpnotcWDQLy4O ps4pnSessions: 1 @@ -253,14 +202,6 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 - ps4ReprojectionSupport: 0 - ps4UseAudio3dBackend: 0 - ps4Audio3dVirtualSpeakerCount: 14 - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: @@ -309,6 +250,7 @@ PlayerSettings: psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 psmSplashimage: {fileID: 0} + virtualRealitySupported: 0 spritePackerPolicy: scriptingDefineSymbols: {} metroPackageName: GameJamProject @@ -400,17 +342,6 @@ PlayerSettings: tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF stvDeviceAddress: stvProductDescription: stvProductAuthor: @@ -476,6 +407,7 @@ PlayerSettings: additionalIl2CppArgs::additionalIl2CppArgs: firstStreamedSceneWithResources: 0 cloudProjectId: + projectId: projectName: organizationId: cloudEnabled: 0