Merge branch 'master' of http://git.thirdlevel.gmbh:80/GameDevOS/LD39

game/Assets/Scenes/Main.unity

@@ -145,7 +145,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4016758563413220, guid: 33baed11feb9da44b9aa11678990fc51, type: 2}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 1400659369070184, guid: 33baed11feb9da44b9aa11678990fc51, type: 2}
       propertyPath: m_Name
@@ -282,7 +282,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4016758563413220, guid: 33baed11feb9da44b9aa11678990fc51, type: 2}
       propertyPath: m_RootOrder
-      value: 9
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 1400659369070184, guid: 33baed11feb9da44b9aa11678990fc51, type: 2}
       propertyPath: m_Name
@@ -328,7 +328,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textfield: {fileID: 752170859}
   disAndEnableObject: {fileID: 127693553}
-  winningStation: {fileID: 763889166}
+  winningStation: {fileID: 1896536729}
   player: {fileID: 1777128478}
 --- !u!114 &241635331
 MonoBehaviour:
@@ -399,7 +399,7 @@ RectTransform:
   m_Children:
   - {fileID: 127693554}
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1111,7 +1111,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4016758563413220, guid: 33baed11feb9da44b9aa11678990fc51, type: 2}
       propertyPath: m_RootOrder
-      value: 8
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 114228307958694658, guid: 33baed11feb9da44b9aa11678990fc51,
         type: 2}
@@ -1121,12 +1121,6 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 33baed11feb9da44b9aa11678990fc51, type: 2}
   m_IsPrefabParent: 0
---- !u!114 &763889166 stripped
-MonoBehaviour:
-  m_PrefabParentObject: {fileID: 114141068189092904, guid: c991ea08034a50545a37f2df5089cf02,
-    type: 2}
-  m_PrefabInternal: {fileID: 910833141}
-  m_Script: {fileID: 11500000, guid: ceffab953fe77c04191a6806cb63beab, type: 3}
 --- !u!1001 &869711774
 Prefab:
   m_ObjectHideFlags: 0
@@ -1178,53 +1172,6 @@ Transform:
   m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
     type: 2}
   m_PrefabInternal: {fileID: 869711774}
---- !u!1001 &910833141
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -5.79
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 4.29
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4922802678927886, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 114141068189092904, guid: c991ea08034a50545a37f2df5089cf02,
-        type: 2}
-      propertyPath: powerLevel
-      value: 89
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &995166813
 GameObject:
   m_ObjectHideFlags: 0
@@ -1411,6 +1358,60 @@ Transform:
   m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
     type: 2}
   m_PrefabInternal: {fileID: 1126876492}
+--- !u!1001 &1145186729
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -4.65
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -2.6483585e-17
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 2.61
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalScale.x
+      value: 0.8949458
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalScale.y
+      value: 0.89494604
+      objectReference: {fileID: 0}
+    - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+      propertyPath: m_LocalScale.z
+      value: 0.89494604
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &1173554097
 Prefab:
   m_ObjectHideFlags: 0
@@ -1588,7 +1589,7 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1278158971}
   m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
-  m_LocalPosition: {x: 0, y: 12.59, z: -4.76}
+  m_LocalPosition: {x: 0, y: 17.88, z: -7.23}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -1605,6 +1606,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  profile: {fileID: 0}
 --- !u!1001 &1387540009
 Prefab:
   m_ObjectHideFlags: 0
@@ -1970,6 +1972,12 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
   m_IsPrefabParent: 0
+--- !u!114 &1896536729 stripped
+MonoBehaviour:
+  m_PrefabParentObject: {fileID: 114864780384384832, guid: 577edfe1bc6758a4d9b91d58d990d07e,
+    type: 2}
+  m_PrefabInternal: {fileID: 1145186729}
+  m_Script: {fileID: 11500000, guid: ceffab953fe77c04191a6806cb63beab, type: 3}
 --- !u!1001 &1906683132
 Prefab:
   m_ObjectHideFlags: 0
@@ -2068,7 +2076,7 @@ Transform:
   - {fileID: 1906683133}
   - {fileID: 1173554098}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1967258213
 MonoBehaviour:

game/Assets/Scripts/Player.cs

@@ -159,7 +159,7 @@ public class Player : MonoBehaviour
         {
             walkingDegenTimer = 0;
         }
-        Debug.Log(speed + ", " + walkingDegenTimer);
+        //Debug.Log(speed + ", " + walkingDegenTimer);
     }
 
     public float movementDegenRate = 0.1f;
@@ -194,6 +194,7 @@ public class Player : MonoBehaviour
         cameraOffset = Camera.main.transform.position - transform.position;
         lightIntensity = muzzleLight.intensity;
         var joystickNames = Input.GetJoystickNames();
+        Debug.Log(joystickNames[0]);
         useMouseLook = joystickNames.Length == 0 || string.IsNullOrEmpty(joystickNames[0]);
         if (useMouseLook)
         {