Commit 5ebca023 authored by Adrian Wegener's avatar Adrian Wegener

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can
parents eb33acc6 79ba2f6a
......@@ -10,7 +10,7 @@ public class ShowCountdown : MonoBehaviour
{
public TextMeshProUGUI delayTextField;
private float timer = 0;
private float _timer = 0;
// called zero
void Awake()
{
......@@ -32,28 +32,51 @@ public class ShowCountdown : MonoBehaviour
// Debug.Log(mode);
delayTextField.text = "funcs";
timer = 0;
_timer = 0;
StartCoroutine(UpdateDelayText());
}
IEnumerator UpdateDelayText() //TODO : Anpassen an Runden Countdown/Zwischen Runden
{
int dt = GameManager.instance.data.DelayTime - 1;
for (int i = 0; i < GameManager.instance.data.DelayTime; i++)
{
if(dt-i < 1)
continue;
delayTextField.text = (dt- i) + "";
for (int w = 0; w < 50; w++)
{
delayTextField.fontSize -= 2f;
yield return new WaitForSecondsRealtime(0.01f );
}
float sec = 1;
float framerate = (sec / Time.unscaledDeltaTime);
int dt = GameManager.instance.data.DelayTime-1;
WaitForSecondsRealtime waiting = new WaitForSecondsRealtime(0.06f);
for (int i = 0; i < GameManager.instance.data.DelayTime; i++)
{
delayTextField.text = dt + "";
for (float frame = 0; frame < 1; frame += 1 / framerate)
{
delayTextField.fontSize -= Mathf.Lerp(0, 1, frame) * 10;
//print(delayTextField.fontSize);
yield return waiting;
}
delayTextField.fontSize = 300;
dt--;
if (dt < 1)
{
delayTextField.text = "Go!";
continue;
}
}
delayTextField.fontSize = 300;
}
delayTextField.text = "GO!";
/*int dt = GameManager.instance.data.DelayTime - 1;
for (int i = 0; i < GameManager.instance.data.DelayTime; i++)
{
if(dt-i < 1)
continue;
delayTextField.text = (dt- i) + "";
for (int w = 0; w < 50; w++)
{
delayTextField.fontSize -= 2f;
yield return new WaitForSecondsRealtime(0.01f );
}
delayTextField.fontSize = 300;
}
delayTextField.text = "GO!";*/
}
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6176636122690218753
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6176636122690218759}
- component: {fileID: 6176636122690218758}
m_Layer: 0
m_Name: GameHandler
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6176636122690218759
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6176636122690218753}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6176636122690218758
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6176636122690218753}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5aac9e32d80758847ae9080139532b31, type: 3}
m_Name:
m_EditorClassIdentifier:
data: {fileID: 11400000, guid: 03dc90f28ad25934eb09d2c34b73da28, type: 2}
startDelay: {fileID: 11400000, guid: 2a8e93333552cee40bb1655c20f581d8, type: 2}
roundTime: {fileID: 11400000, guid: 40639211e190f5048a0415173c0ece66, type: 2}
_handler1: {fileID: 0}
_handler2: {fileID: 0}
fileFormatVersion: 2
guid: afeeab36ad3988b48a0b2393b9cad511
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 4412139409271564331}
- component: {fileID: 4412139409271564330}
- component: {fileID: 4412139409271564309}
- component: {fileID: 7027236318075671688}
m_Layer: 0
m_Name: Player1Manager
m_TagString: Untagged
......@@ -39,7 +40,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4412139409271564308}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
......@@ -58,8 +59,8 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem,
Version=0.9.6.0, Culture=neutral, PublicKeyToken=null
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_NeverAutoSwitchControlSchemes: 1
m_DefaultControlScheme: Gamepad
m_DefaultActionMap: 480005df-eb34-4300-80ff-96103380a4f8
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
......@@ -77,3 +78,15 @@ MonoBehaviour:
m_EditorClassIdentifier:
movement: {fileID: 0}
mutation: {fileID: 0}
--- !u!114 &7027236318075671688
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4412139409271564308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 865a6f4af420e454086e6906b464c7b7, type: 3}
m_Name:
m_EditorClassIdentifier:
......@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 5204299803420509725}
- component: {fileID: 5204299803420509724}
- component: {fileID: 5204299803420509727}
- component: {fileID: 6895848061928444444}
m_Layer: 0
m_Name: Player2Manager
m_TagString: Untagged
......@@ -39,7 +40,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5204299803420509726}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
......@@ -58,8 +59,8 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem,
Version=0.9.6.0, Culture=neutral, PublicKeyToken=null
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_NeverAutoSwitchControlSchemes: 1
m_DefaultControlScheme: Gamepad
m_DefaultActionMap: 38732b26-d9e3-4196-a316-9054667e9b3d
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
......@@ -77,3 +78,15 @@ MonoBehaviour:
m_EditorClassIdentifier:
movement: {fileID: 0}
mutation: {fileID: 0}
--- !u!114 &6895848061928444444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5204299803420509726}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 865a6f4af420e454086e6906b464c7b7, type: 3}
m_Name:
m_EditorClassIdentifier:
......@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2301140016569282784}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.001, y: 0.026, z: 0.673}
m_LocalPosition: {x: 0, y: 0, z: 0.56}
m_LocalScale: {x: 0.2, y: 0.2, z: 2}
m_Children: []
m_Father: {fileID: 2301140017794985288}
......@@ -90,9 +90,8 @@ GameObject:
- component: {fileID: 2301140017794985289}
- component: {fileID: 2301140017794985290}
- component: {fileID: 5210150450737429901}
- component: {fileID: 5454309568428411407}
- component: {fileID: 3713909334391863638}
- component: {fileID: 887048797207627629}
- component: {fileID: 5454309568428411407}
- component: {fileID: 1957649875713174593}
m_Layer: 8
m_Name: Body
......@@ -108,14 +107,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2301140017794985292}
m_LocalRotation: {x: -0.008711699, y: 0.00008658762, z: -0.5912426, w: 0.80644673}
m_LocalPosition: {x: 2.1443129, y: 1.2344216, z: -1.3224738}
m_LocalScale: {x: 1, y: 1.7813, z: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 2, z: 1}
m_Children:
- {fileID: 2301140016569282799}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -0.799, y: 0.59800005, z: -72.498}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2301140017794985289
MeshFilter:
m_ObjectHideFlags: 0
......@@ -178,21 +177,6 @@ Rigidbody:
m_Interpolate: 1
m_Constraints: 112
m_CollisionDetection: 0
--- !u!114 &5454309568428411407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2301140017794985292}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 64ce53df6ad8d004b9a944bc4741ba8e, type: 3}
m_Name:
m_EditorClassIdentifier:
canMove: 1
moveSpeed: 5
maxSpeed: 10
--- !u!136 &3713909334391863638
CapsuleCollider:
m_ObjectHideFlags: 0
......@@ -207,7 +191,7 @@ CapsuleCollider:
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &887048797207627629
--- !u!114 &5454309568428411407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -216,10 +200,15 @@ MonoBehaviour:
m_GameObject: {fileID: 2301140017794985292}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 93de85a151093d54f8c74f9415538553, type: 3}
m_Script: {fileID: 11500000, guid: 64ce53df6ad8d004b9a944bc4741ba8e, type: 3}
m_Name:
m_EditorClassIdentifier:
player: 2
canMove: 1
moveSpeed: 8
maxSpeed: 10
dir: {x: 0, y: 0}
interpolation: 10
turnSpeed: 5
--- !u!114 &1957649875713174593
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 7134929021021781532}
- component: {fileID: 500277867958067635}
- component: {fileID: 3164234182544628089}
- component: {fileID: 5330688972342423096}
m_Layer: 8
m_Name: Head
m_TagString: HeadPlayer
......@@ -126,16 +125,4 @@ MonoBehaviour:
canMove: 1
moveSpeed: 5
maxSpeed: 10
--- !u!114 &5330688972342423096
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6281308049697573992}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 93de85a151093d54f8c74f9415538553, type: 3}
m_Name:
m_EditorClassIdentifier:
player: 1
dir: {x: 0, y: 0}
......@@ -690,6 +690,8 @@ GameObject:
- component: {fileID: 770186383286899028}
- component: {fileID: 532940879910498657}
- component: {fileID: 3201751554819008786}
- component: {fileID: 1041388776}
- component: {fileID: 1041388781}
m_Layer: 8
m_Name: body
m_TagString: BodyPlayer
......@@ -706,7 +708,7 @@ Transform:
m_GameObject: {fileID: 6045165005171275833}
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_LocalScale: {x: 3, y: 3, z: 3}
m_Children:
- {fileID: 7201478858573411899}
m_Father: {fileID: 0}
......@@ -792,6 +794,45 @@ MonoBehaviour:
m_EditorClassIdentifier:
mutation1: {fileID: 11400000, guid: 3a533c310414823458ca2a6ea6c6ddce, type: 2}
mutation2: {fileID: 11400000, guid: 674a68f9f71d2b640914ad1f3be2cbc0, type: 2}
--- !u!114 &1041388776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6045165005171275833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5dcddde29f5d3747912be55aba7420a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1041388781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6045165005171275833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 60fb516279b74524f91fcc9af2cfc4ae,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Gamepad
m_DefaultActionMap: 38732b26-d9e3-4196-a316-9054667e9b3d
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1 &6917490051661084803
GameObject:
m_ObjectHideFlags: 0
......
......@@ -95,6 +95,7 @@ GameObject:
- component: {fileID: 9070284434229523640}
- component: {fileID: 7286349345975393423}
- component: {fileID: 6099359186389172106}
- component: {fileID: 1029178051}
m_Layer: 8
m_Name: head
m_TagString: HeadPlayer
......@@ -111,7 +112,7 @@ Transform:
m_GameObject: {fileID: 6363572820684086373}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.1229997, y: -0.5966866, z: 0.8825981}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 4, y: 4, z: 4}
m_Children:
- {fileID: 4386303693745616587}
m_Father: {fileID: 0}
......@@ -138,7 +139,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6363572820684086373}
serializedVersion: 2
m_Mass: 1
m_Mass: 0.4
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
......@@ -159,8 +160,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
canMove: 1
moveSpeed: 5
maxSpeed: 10
moveSpeed: 10
maxSpeed: 20
--- !u!114 &6099359186389172106
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -175,3 +176,30 @@ MonoBehaviour:
m_EditorClassIdentifier:
mutation1: {fileID: 11400000, guid: c64ba09c4b1c0eb479ec633963cb7215, type: 2}
mutation2: {fileID: 11400000, guid: 296440bd939672349ab89b6dd84e58fe, type: 2}
--- !u!114 &1029178051
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6363572820684086373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 60fb516279b74524f91fcc9af2cfc4ae,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Keyboard
m_DefaultActionMap: 480005df-eb34-4300-80ff-96103380a4f8
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0