Skip to content
This repository has been archived by the owner on Jun 12, 2022. It is now read-only.

Commit

Permalink
start button on controller
Browse files Browse the repository at this point in the history
  • Loading branch information
Raicuparta committed Nov 12, 2016
1 parent 11f5aef commit e1d9d3d
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 12 deletions.
56 changes: 48 additions & 8 deletions Assets/City.unity
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ RenderSettings:
m_AmbientSkyColor: {r: 1.36, g: 1.36, b: 1.36, a: 1.36}
m_AmbientEquatorColor: {r: 0.15504, g: 0.17, b: 0.18088001, a: 1.36}
m_AmbientGroundColor: {r: 0.06392, g: 0.058480002, b: 0.0476, a: 1.36}
m_AmbientIntensity: 1.36
m_AmbientIntensity: 1.44
m_AmbientMode: 0
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
Expand All @@ -535,10 +535,10 @@ RenderSettings:
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 0
m_ReflectionIntensity: 0.525
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0}
m_Sun: {fileID: 1815506225}
m_IndirectSpecularColor: {r: 0.47928143, g: 0.53343594, b: 0.61861724, a: 0.525}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
Expand All @@ -550,7 +550,7 @@ LightmapSettings:
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_TemporalCoherenceThreshold: 1
m_EnvironmentLightingMode: 0
m_EnvironmentLightingMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings:
Expand Down Expand Up @@ -117102,6 +117102,46 @@ Prefab:
propertyPath: Height
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalPosition.z
value: 469.3
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalPosition.x
value: -75.9
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalPosition.y
value: 45.7
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalRotation.x
value: 0.026176957
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalRotation.y
value: 0.9996574
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalRotation.z
value: -0.0000000055879354
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalRotation.w
value: 0.00000017881393
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalEulerAnglesHint.y
value: 180.00002
objectReference: {fileID: 0}
- target: {fileID: 4000010966267086, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
propertyPath: m_LocalEulerAnglesHint.z
value: 2.913
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: d487ae26dc8fdb84f9338635ecacc9d2, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -118947,8 +118987,8 @@ Light:
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.303
m_Bias: 0.064
m_NormalBias: 0.33
m_Bias: 0.73
m_NormalBias: 0
m_NearPlane: 0.24
m_Cookie: {fileID: 0}
m_DrawHalo: 0
Expand All @@ -118957,7 +118997,7 @@ Light:
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Lightmapping: 4
m_Lightmapping: 1
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1.22
m_ShadowRadius: 0
Expand Down
Binary file modified Assets/City/LightingData.asset
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/City/LightingData.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/City/ReflectionProbe-0.exr
Binary file not shown.
4 changes: 3 additions & 1 deletion Assets/City/ReflectionProbe-0.exr.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Assets/Scripts/GameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using System.Collections.Generic;
using UnityStandardAssets.CrossPlatformInput;

public class GameManager : MonoBehaviour {
public Canvas UI;
Expand Down Expand Up @@ -62,7 +63,7 @@ void StartRound () {
}

private void Update () {
if (Input.GetKeyDown(KeyCode.Return)) {
if (CrossPlatformInputManager.GetButton("Start")) {
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
}

Expand Down
32 changes: 32 additions & 0 deletions ProjectSettings/InputManager.asset
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,35 @@ InputManager:
type: 2
axis: 8
joyNum: 0
- serializedVersion: 3
m_Name: Start
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: return
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1
snap: 1
invert: 0
type: 0
axis: 8
joyNum: 0
- serializedVersion: 3
m_Name: Start
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 7
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1
snap: 1
invert: 0
type: 0
axis: 8
joyNum: 0
2 changes: 1 addition & 1 deletion ProjectSettings/QualitySettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 0
m_CurrentQuality: 5
m_QualitySettings:
- serializedVersion: 2
name: Fastest
Expand Down

0 comments on commit e1d9d3d

Please sign in to comment.