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

Conflicts:
	game/Assets/Scenes/Main.unity

game/Assets/PostProcessingProfile.asset

@@ -97,14 +97,14 @@ MonoBehaviour:
       logMin: -8
       logMax: 4
   bloom:
-    m_Enabled: 0
+    m_Enabled: 1
     m_Settings:
       bloom:
         intensity: 5
-        threshold: 0.9
-        softKnee: 0.14
-        radius: 3
-        antiFlicker: 0
+        threshold: 1.14
+        softKnee: 0.093
+        radius: 1.59
+        antiFlicker: 1
       lensDirt:
         texture: {fileID: 0}
         intensity: 3
@@ -288,10 +288,10 @@ MonoBehaviour:
   grain:
     m_Enabled: 1
     m_Settings:
-      colored: 1
-      intensity: 0.44
-      size: 1
-      luminanceContribution: 0.78
+      colored: 0
+      intensity: 0.279
+      size: 0.65
+      luminanceContribution: 0.463
   vignette:
     m_Enabled: 0
     m_Settings:

game/Assets/Prefabs/Station.prefab

@@ -9,170 +9,199 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1924482778246626}
+  m_RootGameObject: {fileID: 1634540948877532}
   m_IsPrefabParent: 1
---- !u!1 &1120854798723904
+--- !u!1 &1087827686162864
 GameObject:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4147236143541314}
-  - component: {fileID: 33783476385244436}
-  - component: {fileID: 65950434439826722}
-  - component: {fileID: 23300842063029706}
+  - component: {fileID: 4638878660122172}
+  - component: {fileID: 120084001983580128}
   m_Layer: 0
-  m_Name: Cube
+  m_Name: LineRenderer
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1137583149116186
+--- !u!1 &1097423920692548
 GameObject:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4985552183805216}
+  - component: {fileID: 4015070545992116}
+  - component: {fileID: 33709348325058430}
+  - component: {fileID: 65929566503032716}
+  - component: {fileID: 23624373306831254}
   m_Layer: 0
-  m_Name: Gauge
+  m_Name: Cube (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1619849205212652
+--- !u!1 &1634540948877532
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4390912597775112}
-  - component: {fileID: 33190429120271632}
-  - component: {fileID: 65487131058749816}
-  - component: {fileID: 23572982102603444}
+  - component: {fileID: 4922802678927886}
+  - component: {fileID: 114141068189092904}
+  - component: {fileID: 135258268890264724}
   m_Layer: 0
-  m_Name: BAse
-  m_TagString: Station
+  m_Name: Station
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1783064565237594
+--- !u!1 &1654741174817914
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4879897893005044}
-  - component: {fileID: 33980680541586678}
-  - component: {fileID: 65513221946016260}
-  - component: {fileID: 23419505957914362}
+  - component: {fileID: 4200559040078332}
   m_Layer: 0
-  m_Name: Cube (1)
+  m_Name: Gauge
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1750081169527488
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4817509838735154}
+  - component: {fileID: 33134458378078396}
+  - component: {fileID: 65960974367629880}
+  - component: {fileID: 23126068614238074}
+  m_Layer: 0
+  m_Name: Cube
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1924482778246626
+--- !u!1 &1943750880505340
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4783610330497104}
-  - component: {fileID: 33883586336100674}
-  - component: {fileID: 65075931006124238}
-  - component: {fileID: 114164362095571268}
+  - component: {fileID: 4028889068678830}
+  - component: {fileID: 33485415923932388}
+  - component: {fileID: 65337339084235394}
+  - component: {fileID: 23110681104533388}
   m_Layer: 0
-  m_Name: Station
+  m_Name: BAse
   m_TagString: Station
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4147236143541314
+--- !u!4 &4015070545992116
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1120854798723904}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.4, z: 0}
-  m_LocalScale: {x: 1.6134144, y: 0.8, z: 0.25}
+  m_GameObject: {fileID: 1097423920692548}
+  m_LocalRotation: {x: -0, y: -0.70710635, z: -0, w: 0.7071073}
+  m_LocalPosition: {x: 0, y: 0.58, z: 0}
+  m_LocalScale: {x: 0.2855486, y: 2.038845, z: 0.16371344}
   m_Children: []
-  m_Father: {fileID: 4985552183805216}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4390912597775112
+  m_Father: {fileID: 4922802678927886}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0}
+--- !u!4 &4028889068678830
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1619849205212652}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.08566746, z: 0}
-  m_LocalScale: {x: 0.3810926, y: 0.5788342, z: 0.5788342}
+  m_GameObject: {fileID: 1943750880505340}
+  m_LocalRotation: {x: -0, y: -0.70710635, z: -0, w: 0.7071073}
+  m_LocalPosition: {x: 0, y: 1.82, z: 0}
+  m_LocalScale: {x: 1.069259, y: 2.7267442, z: 1.9450868}
   m_Children:
-  - {fileID: 4985552183805216}
-  m_Father: {fileID: 4783610330497104}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4783610330497104
+  - {fileID: 4200559040078332}
+  m_Father: {fileID: 4922802678927886}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0}
+--- !u!4 &4200559040078332
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1924482778246626}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -5.24, y: 1.836, z: -7.12}
-  m_LocalScale: {x: 1.3120171, y: 5.1828313, z: 2.5914156}
+  m_GameObject: {fileID: 1654741174817914}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.4, z: 0}
+  m_LocalScale: {x: 1.0992955, y: 1, z: 1.5335814}
   m_Children:
-  - {fileID: 4879897893005044}
-  - {fileID: 4390912597775112}
-  m_Father: {fileID: 0}
+  - {fileID: 4817509838735154}
+  m_Father: {fileID: 4028889068678830}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4879897893005044
+--- !u!4 &4638878660122172
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1783064565237594}
+  m_GameObject: {fileID: 1087827686162864}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 2.14, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4922802678927886}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4817509838735154
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1750081169527488}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.24812694, z: 0}
-  m_LocalScale: {x: 0.2855486, y: 0.21453197, z: 0.16371344}
+  m_LocalPosition: {x: 0, y: 0.4, z: 0}
+  m_LocalScale: {x: 1.6134144, y: 0.8, z: 0.25}
   m_Children: []
-  m_Father: {fileID: 4783610330497104}
+  m_Father: {fileID: 4200559040078332}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4985552183805216
+--- !u!4 &4922802678927886
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1137583149116186}
+  m_GameObject: {fileID: 1634540948877532}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.4, z: 0}
+  m_LocalPosition: {x: -5.79, y: 0, z: 4.29}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4147236143541314}
-  m_Father: {fileID: 4390912597775112}
+  - {fileID: 4028889068678830}
+  - {fileID: 4015070545992116}
+  - {fileID: 4638878660122172}
+  m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &23300842063029706
+--- !u!23 &23110681104533388
 MeshRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1120854798723904}
+  m_GameObject: {fileID: 1943750880505340}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -180,7 +209,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 2100000, guid: 9ab11714b79356448813f757518372d2, type: 2}
+  - {fileID: 2100000, guid: 136f1fa5348ff1a4d8be1cec2afbd035, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -199,12 +228,12 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!23 &23419505957914362
+--- !u!23 &23126068614238074
 MeshRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1783064565237594}
+  m_GameObject: {fileID: 1750081169527488}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -212,7 +241,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 2100000, guid: 136f1fa5348ff1a4d8be1cec2afbd035, type: 2}
+  - {fileID: 2100000, guid: 9ab11714b79356448813f757518372d2, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -231,12 +260,12 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!23 &23572982102603444
+--- !u!23 &23624373306831254
 MeshRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1619849205212652}
+  m_GameObject: {fileID: 1097423920692548}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -263,93 +292,180 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &33190429120271632
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1619849205212652}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!33 &33783476385244436
+--- !u!33 &33134458378078396
 MeshFilter:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1120854798723904}
+  m_GameObject: {fileID: 1750081169527488}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!33 &33883586336100674
+--- !u!33 &33485415923932388
 MeshFilter:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1924482778246626}
+  m_GameObject: {fileID: 1943750880505340}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!33 &33980680541586678
+--- !u!33 &33709348325058430
 MeshFilter:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1783064565237594}
+  m_GameObject: {fileID: 1097423920692548}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!65 &65075931006124238
+--- !u!65 &65337339084235394
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1924482778246626}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65487131058749816
-BoxCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1619849205212652}
+  m_GameObject: {fileID: 1943750880505340}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65513221946016260
+--- !u!65 &65929566503032716
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1783064565237594}
+  m_GameObject: {fileID: 1097423920692548}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65950434439826722
+--- !u!65 &65960974367629880
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1120854798723904}
+  m_GameObject: {fileID: 1750081169527488}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &114164362095571268
+--- !u!114 &114141068189092904
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1924482778246626}
+  m_GameObject: {fileID: 1634540948877532}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ceffab953fe77c04191a6806cb63beab, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxPower: 2
-  gauge: {fileID: 4985552183805216}
+  maxPower: 25
+  gauge: {fileID: 4200559040078332}
+  powerSuckDelay: 0.5
   powerLevel: 0
+  lineRenderer: {fileID: 120084001983580128}
+--- !u!120 &120084001983580128
+LineRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1087827686162864}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  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
+  m_Positions:
+  - {x: -5.79, y: 0, z: 4.29}
+  - {x: -2.8640223, y: 1, z: 1.1426125}
+  m_Parameters:
+    serializedVersion: 2
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 0
+        inSlope: 3.7716184
+        outSlope: 3.7716184
+        tangentMode: 0
+      - serializedVersion: 2
+        time: 1
+        value: 0.9146271
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 0
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 1
+    generateLightingData: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
+--- !u!135 &135258268890264724
+SphereCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634540948877532}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 6
+  m_Center: {x: 0, y: 0, z: 0}

game/Assets/Prefabs/Station.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c991ea08034a50545a37f2df5089cf02
-timeCreated: 1501360590
+timeCreated: 1501421219
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 100100000

game/Assets/Scenes/Main.unity

@@ -20,11 +20,11 @@ RenderSettings:
   m_FogDensity: 0.01
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientSkyColor: {r: 0, g: 0, b: 0, 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: 0.27
-  m_AmbientMode: 0
+  m_AmbientIntensity: 0
+  m_AmbientMode: 3
   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
@@ -35,10 +35,10 @@ RenderSettings:
   m_DefaultReflectionMode: 0
   m_DefaultReflectionResolution: 128
   m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
+  m_ReflectionIntensity: 0
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427147, b: 0.56452364, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -51,8 +51,8 @@ LightmapSettings:
     m_AlbedoBoost: 1
     m_TemporalCoherenceThreshold: 1
     m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 1
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
     serializedVersion: 9
     m_Resolution: 2
@@ -113,7 +113,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -129,15 +129,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -145,7 +145,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 11
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -154,26 +154,6 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &164227371 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1812503719}
---- !u!4 &209618726 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1396677270}
---- !u!4 &403990480 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 138106038}
---- !u!4 &432567156 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1955320057}
 --- !u!1 &551122708
 GameObject:
   m_ObjectHideFlags: 0
@@ -189,7 +169,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!108 &551122709
 Light:
   m_ObjectHideFlags: 0
@@ -251,19 +231,14 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!4 &591842473 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1399754681}
 --- !u!1001 &690485838
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -279,15 +254,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -295,7 +270,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 9
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -309,7 +284,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -325,15 +300,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -341,7 +316,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 8
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -350,16 +325,48 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &710616950 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1166928400}
---- !u!4 &903141329 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1962929250}
+--- !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: 19
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &995166813
 GameObject:
   m_ObjectHideFlags: 0
@@ -391,7 +398,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 72536e6755f74f14fb801af574a0f53d, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -442,14 +449,14 @@ Transform:
   m_LocalScale: {x: 10, y: 1, z: 10}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1166928400
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -465,15 +472,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -481,7 +488,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 5
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -527,7 +534,27 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4413073277323274, guid: e6383ffd9f8688f4a9ba9705843d54e2, type: 2}
       propertyPath: m_RootOrder
-      value: 5
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 108365963384445830, guid: e6383ffd9f8688f4a9ba9705843d54e2,
+        type: 2}
+      propertyPath: m_Intensity
+      value: 3.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 108365963384445830, guid: e6383ffd9f8688f4a9ba9705843d54e2,
+        type: 2}
+      propertyPath: m_Range
+      value: 20.36
+      objectReference: {fileID: 0}
+    - target: {fileID: 108365963384445830, guid: e6383ffd9f8688f4a9ba9705843d54e2,
+        type: 2}
+      propertyPath: m_Shadows.m_Strength
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114322613409989222, guid: e6383ffd9f8688f4a9ba9705843d54e2,
+        type: 2}
+      propertyPath: lineRenderer
+      value: 
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: e6383ffd9f8688f4a9ba9705843d54e2, type: 2}
@@ -544,6 +571,7 @@ GameObject:
   - component: {fileID: 1278158974}
   - component: {fileID: 1278158973}
   - component: {fileID: 1278158972}
+  - component: {fileID: 1278158977}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -581,7 +609,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.09558821, g: 0, b: 0, a: 0}
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -614,19 +642,31 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1278158971}
-  m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254}
-  m_LocalPosition: {x: 0, y: 14, z: -10}
+  m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
+  m_LocalPosition: {x: 0, y: 12.59, z: -4.76}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
+--- !u!114 &1278158977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1278158971}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 11400000, guid: 33391131f7192d242ab5e5f2b501c232, type: 2}
 --- !u!1001 &1342839122
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -642,15 +682,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -658,7 +698,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 12
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -672,7 +712,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -688,15 +728,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -704,7 +744,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 4
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -718,7 +758,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -734,15 +774,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -750,7 +790,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 2
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -764,7 +804,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -780,15 +820,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -796,7 +836,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 6
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -805,11 +845,6 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &1586599902 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 703051441}
 --- !u!1 &1650730587
 GameObject:
   m_ObjectHideFlags: 0
@@ -870,71 +905,14 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1693210522
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -5.24
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 1.836
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: -7.12
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 114164362095571268, guid: c991ea08034a50545a37f2df5089cf02,
-        type: 2}
-      propertyPath: maxPower
-      value: 20
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
-  m_IsPrefabParent: 0
---- !u!4 &1702924797 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 2066467295}
---- !u!4 &1786363983 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1342839122}
 --- !u!1001 &1812503719
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -950,15 +928,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -966,7 +944,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 10
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -1012,7 +990,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 95461355863206716, guid: 673629bba9f02458cacf9d13115e1078,
         type: 2}
@@ -1027,7 +1005,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -1043,15 +1021,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -1059,7 +1037,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 3
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -1073,7 +1051,7 @@ Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -1089,15 +1067,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -1105,63 +1083,17 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 0
+      value: 5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
---- !u!1 &1986701167
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1986701168}
-  m_Layer: 0
-  m_Name: Enemies
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1986701168
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1986701167}
-  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:
-  - {fileID: 903141329}
-  - {fileID: 2137870718}
-  - {fileID: 209618726}
-  - {fileID: 432567156}
-  - {fileID: 2015775418}
-  - {fileID: 710616950}
-  - {fileID: 591842473}
-  - {fileID: 1702924797}
-  - {fileID: 1586599902}
-  - {fileID: 2051959638}
-  - {fileID: 164227371}
-  - {fileID: 403990480}
-  - {fileID: 1786363983}
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &2015775418 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 1372298798}
 --- !u!1001 &2034771851
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -1177,15 +1109,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -1193,7 +1125,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 1
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -1202,17 +1134,12 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &2051959638 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 690485838}
 --- !u!1001 &2066467295
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1986701168}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.x
@@ -1228,15 +1155,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalRotation.w
@@ -1244,7 +1171,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 7
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -1253,8 +1180,3 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &2137870718 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
-    type: 2}
-  m_PrefabInternal: {fileID: 2034771851}

game/Assets/Scripts/DayTimeManager.cs

@@ -68,7 +68,6 @@ public class DayTimeManager : MonoBehaviour {
 	void Start () {
 		_position = sunlight.gameObject.transform.position;
 		_rotation = sunlight.gameObject.transform.rotation.ToEulerAngles();
-		Debug.Log("Got Rotation " + _rotation);
 	}
 	
 	// Update is called once per frame
@@ -85,8 +84,6 @@ public class DayTimeManager : MonoBehaviour {
 
 		float rotationDirection = Mathf.Sign(this.timeFactor - 0.5f);
 
-		Debug.Log("DayTimeLabel: " + dayTimeLabel.ToString());
-
 		switch (rotAxis)
 		{
 			case RotationAxis.X:

game/Assets/Scripts/Player.cs

@@ -50,6 +50,7 @@ public class Player : MonoBehaviour
     private Vector3 cameraVelocity;
     private bool shooting = false;
     private float lightIntensity;
+    private bool useMouseLook;
 
     // Use this for initialization
 	void Start ()
@@ -57,6 +58,13 @@ public class Player : MonoBehaviour
 	    speed = startSpeed;
 	    cameraOffset = Camera.main.transform.position - transform.position;
 	    lightIntensity = muzzleLight.intensity;
+	    var joystickNames = Input.GetJoystickNames();
+	    useMouseLook = joystickNames.Length == 0 || string.IsNullOrEmpty(joystickNames[0]);
+	    if (useMouseLook)
+	    {
+	        lookSmoothingSeconds = 0;
+
+	    }
 	}
 	
 	// Update is called once per frame
@@ -108,11 +116,21 @@ public class Player : MonoBehaviour
     void GetInput()
     {
         shooting = Input.GetButton("Fire1");
-        lookDirection = new Vector3(
+        var padLook = new Vector3(
             Input.GetAxis("LookX"),
             0,
             -Input.GetAxis("LookY")
-        ).normalized;
+        );
+        if (useMouseLook)
+        {
+            var mouseLook = Input.mousePosition - Camera.main.WorldToScreenPoint(transform.position);
+            mouseLook.Normalize();
+            lookDirection = new Vector3(mouseLook.x, 0, mouseLook.y);
+        }
+        else if (padLook.magnitude > 0.2f)
+        {
+            lookDirection = padLook.normalized;
+        }
         inputDirection = new Vector3(
             Input.GetAxis("Horizontal"),
             0,

game/Assets/Station.cs

@@ -9,12 +9,20 @@ public class Station : MonoBehaviour
     public float powerSuckDelay = 1;
     public float powerLevel;
 
+    public LineRenderer lineRenderer;
+
     private IEnumerator drainCoroutine;
+    private Transform lineTarget;
 
     // Use this for initialization
 	void Start ()
 	{
 	    powerLevel = 0;
+	    lineTarget = lineRenderer.transform;
+        lineRenderer.SetPositions(new Vector3[]{
+            lineRenderer.transform.position,
+            lineTarget.position,
+        });
 	}
 	
 	// Update is called once per frame
@@ -36,12 +44,14 @@ public class Station : MonoBehaviour
     {
         var level = powerLevel / maxPower;
         gauge.localScale = new Vector3(1, level, 1);
+        lineRenderer.SetPosition(1, lineTarget.position);
     }
 
     void OnTriggerEnter(Collider other)
     {
         if (other.CompareTag("Player"))
         {
+            lineTarget = other.transform;
             drainCoroutine = DrainPower(other.GetComponent<Player>());
             StartCoroutine(drainCoroutine);
         }
@@ -51,7 +61,9 @@ public class Station : MonoBehaviour
     {
         if (other.CompareTag("Player"))
         {
-            StopCoroutine(drainCoroutine);
+            lineTarget = lineRenderer.transform;
+            if (drainCoroutine != null)
+                StopCoroutine(drainCoroutine);
         }
     }
 

game/ProjectSettings/EditorBuildSettings.asset

@@ -5,7 +5,7 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/MenuScreen.unity
     guid: ebead55dba555954a99488bc94cb9159
   - enabled: 1

game/ProjectSettings/GraphicsSettings.asset

@@ -35,6 +35,7 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}