Jam
/
GGJ_2020
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Final Push

master
Joshua Reason 4 years ago
parent
48091d9f7d
commit
7f5e029c92
5 changed files with 222 additions and 12 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +30
    -0
      Assets/Input/HerdInput.inputactions
  2. +184
    -9
      Assets/Scenes/CaseyTest.unity
  3. +1
    -1
      Assets/Scripts/Gameplay/Objective.cs
  4. +5
    -0
      Assets/Scripts/Input/HerdController.cs
  5. +2
    -2
      ProjectSettings/GraphicsSettings.asset

+ 30
- 0
Assets/Input/HerdInput.inputactions View File

@ -20,6 +20,14 @@
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "Reset",
"type": "Button",
"id": "fa5c436d-fc83-4454-8d53-0c8d78560568",
"expectedControlType": "",
"processors": "",
"interactions": ""
}
],
"bindings": [
@ -165,6 +173,28 @@
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d99e7494-e913-47eb-96a4-b6ad124c8286",
"path": "<Keyboard>/r",
"interactions": "",
"processors": "",
"groups": "",
"action": "Reset",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0e28697f-929b-47ef-b174-5b9616a8a3f4",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "",
"action": "Reset",
"isComposite": false,
"isPartOfComposite": false
}
]
}

+ 184
- 9
Assets/Scenes/CaseyTest.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -3984,6 +3984,56 @@ PrefabInstance:
propertyPath: m_Name
value: HumptyDumpty
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.20088032
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.05126316
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.15643582
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9656848
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -21.835001
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 10.042001
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -20.345001
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalPosition.x
value: -7.9
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalPosition.y
value: 16
objectReference: {fileID: 0}
- target: {fileID: 7329785350109343361, guid: 92de93f01184e1a4b9c45bbd45f379cc,
type: 3}
propertyPath: m_LocalPosition.z
value: 3.1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 92de93f01184e1a4b9c45bbd45f379cc, type: 3}
--- !u!4 &454455693 stripped
@ -10947,6 +10997,112 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1207676238}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1720640441
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1720640442}
- component: {fileID: 1720640446}
- component: {fileID: 1720640445}
- component: {fileID: 1720640444}
- component: {fileID: 1720640443}
m_Layer: 0
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1720640442
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1720640441}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 609779081}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1720640443
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1720640441}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7ae3efa00f9dbc5458f2601705870f17, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!135 &1720640444
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1720640441}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 27
m_Center: {x: 0, y: 13.98, z: 0}
--- !u!23 &1720640445
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1720640441}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &1720640446
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1720640441}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1723294766
PrefabInstance:
m_ObjectHideFlags: 0
@ -11875,16 +12031,35 @@ MonoBehaviour:
m_GameObject: {fileID: 1810900738}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
m_RepeatRate: 0.1
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_TrackedDeviceSelectAction: {fileID: 2559092417903258184, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
--- !u!114 &1810900740
MonoBehaviour:
m_ObjectHideFlags: 0
@ -13390,7 +13565,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2009130163}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 8, z: 73.9}
m_LocalPosition: {x: -0.7, y: 8, z: 65.3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1457452761}

+ 1
- 1
Assets/Scripts/Gameplay/Objective.cs View File

@ -30,7 +30,7 @@ public class Objective : MonoBehaviour
// Update is called once per frame
void Update()
{
if(onObjective.Count >= 10)
if(onObjective.Count >= 1)
GameState.WinState();
}
}

+ 5
- 0
Assets/Scripts/Input/HerdController.cs View File

@ -50,6 +50,11 @@ public class HerdController : MonoBehaviour
Ball.GetInput(input);
}
private void OnReset(InputValue value)
{
UnityEngine.SceneManagement.SceneManager.LoadScene("CaseyTest");
}
private void OnSprint(InputValue value)
{
int input = (int)value.Get<float>();

+ 2
- 2
ProjectSettings/GraphicsSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e34efc7ebac921c7383ea0bcd01b87a44cdd45458031a6f76ecfc0acefdf8d41
size 2230
oid sha256:59e8ef26323fe9cd5b24bf27326ad7e2e3051c6696eaf199d5f23077358fb840
size 2437

Write Preview
Loading…
Cancel
Save