From 2937472366237c67fb64a7aaeb3e96f5f47d1005 Mon Sep 17 00:00:00 2001 From: RosimInc Date: Sun, 31 Jan 2016 15:19:13 -0500 Subject: [PATCH] Finalized game ending --- Assets/scenes/GameplayScene.unity | 6 +++--- Assets/scripts/LevelManager.cs | 8 ++++---- ProjectSettings/ProjectSettings.asset | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Assets/scenes/GameplayScene.unity b/Assets/scenes/GameplayScene.unity index ffd74fa..033b256 100644 --- a/Assets/scenes/GameplayScene.unity +++ b/Assets/scenes/GameplayScene.unity @@ -65,6 +65,7 @@ LightmapSettings: m_TextureCompression: 1 m_FinalGather: 0 m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 m_LightmapSnapshot: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &4 @@ -84,9 +85,6 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} ---- !u!127 &5 -LevelGameManager: - m_ObjectHideFlags: 0 --- !u!1 &16934334 GameObject: m_ObjectHideFlags: 0 @@ -587,6 +585,7 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 + m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -768,6 +767,7 @@ MonoBehaviour: yScale: 2.79999995 colSpacing: 0 rowSpacing: 0 + camera: {fileID: 1008797118} dimension: 1 hexagon: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} PlayerColors: diff --git a/Assets/scripts/LevelManager.cs b/Assets/scripts/LevelManager.cs index ca57304..2de9742 100644 --- a/Assets/scripts/LevelManager.cs +++ b/Assets/scripts/LevelManager.cs @@ -11,7 +11,7 @@ public class LevelManager : MonoBehaviour { public float colSpacing = 0f; public float rowSpacing = 0f; public Camera camera; - public Transform darkness; + //public Transform darkness; public float dimension = 0.6f; public GameObject hexagon; @@ -83,14 +83,14 @@ public class LevelManager : MonoBehaviour { SoundManager.Instance.PlayShortHorn(); } - void Update() + /*void Update() { if (Input.GetKeyDown(KeyCode.Space)) { StartCoroutine(SendWinnerToTheSky(state.players[1])); StartCoroutine(FadeToDark()); } - } + }*/ public void PressTile(int letterNum, RuneBehaviour tile) { @@ -280,7 +280,7 @@ public class LevelManager : MonoBehaviour { yield return null; } - Application.LoadLevel(0); + Application.LoadLevel(0); //TODO Check this } private void EnableKinematics(bool state) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index deda64d..c8b6db5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,6 +8,7 @@ PlayerSettings: defaultScreenOrientation: 4 targetDevice: 2 targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: GameJamProject @@ -28,6 +29,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -135,6 +137,15 @@ 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} @@ -224,6 +235,8 @@ PlayerSettings: ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -241,10 +254,13 @@ PlayerSettings: ps4pnGameCustomData: 1 playerPrefsSupport: 0 ps4ReprojectionSupport: 0 + ps4UseAudio3dBackend: 0 + ps4Audio3dVirtualSpeakerCount: 14 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: