Merge branch 'release/v1.0.1'

Assets/AudioPlaceholder.cs

@@ -71,5 +71,6 @@ private void PlayPlane()
 
 	private void PlayPayMoney()
 	{
+
 	}
 }

Assets/Prefabs/Office/Floor.prefab

@@ -155,6 +155,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   playOnStart: 1
+  disableOnFinished: 0
   tweenerCurve:
     serializedVersion: 2
     m_Curve:
@@ -190,6 +191,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   playOnStart: 1
+  disableOnFinished: 0
   tweenerCurve:
     serializedVersion: 2
     m_Curve:

Assets/Prefabs/Office/Wall_Door.prefab

@@ -23,6 +23,7 @@ GameObject:
   - component: {fileID: 23400437066059906}
   - component: {fileID: 95329589979458224}
   - component: {fileID: 114501856451406256}
+  - component: {fileID: 208530294129741910}
   m_Layer: 0
   m_Name: Wall_Door
   m_TagString: Untagged
@@ -45,24 +46,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1426205423038878
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4505093938189750}
-  - component: {fileID: 33584799631894176}
-  - component: {fileID: 23860570538942632}
-  - component: {fileID: 114282310593842400}
-  m_Layer: 0
-  m_Name: Floor (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1664975678855452
 GameObject:
   m_ObjectHideFlags: 1
@@ -108,6 +91,7 @@ GameObject:
   - component: {fileID: 4319925378468322}
   - component: {fileID: 33767934784459674}
   - component: {fileID: 23440456877927172}
+  - component: {fileID: 208033461792916874}
   m_Layer: 0
   m_Name: puerta
   m_TagString: Untagged
@@ -185,19 +169,6 @@ Transform:
   m_Father: {fileID: 4565765911756444}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4505093938189750
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1426205423038878}
-  m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0.303, y: 0.096, z: -0.069000006}
-  m_LocalScale: {x: 0.49051, y: 0.49284023, z: 1.0000005}
-  m_Children: []
-  m_Father: {fileID: 4565765911756444}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4565765911756444
 Transform:
   m_ObjectHideFlags: 1
@@ -210,7 +181,6 @@ Transform:
   m_Children:
   - {fileID: 4584243502033474}
   - {fileID: 4499307659585746}
-  - {fileID: 4505093938189750}
   m_Father: {fileID: 4313217228121604}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -333,40 +303,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!23 &23860570538942632
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1426205423038878}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: 32d6b455dd206f14497421feefe5a727, type: 2}
-  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_StitchLightmapSeams: 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
 --- !u!33 &33529134338407382
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -381,13 +317,6 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1154199880068106}
   m_Mesh: {fileID: 4300000, guid: a3d7e3b26dbc1824d8a53cbc02d1db5f, type: 3}
---- !u!33 &33584799631894176
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1426205423038878}
-  m_Mesh: {fileID: 4300000, guid: 8978359ec7803a4489acaff6bd0fb183, type: 3}
 --- !u!33 &33767934784459674
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -430,35 +359,7 @@ MonoBehaviour:
   m_LayerMask:
     serializedVersion: 2
     m_Bits: 4294967295
-  m_UseGeometry: 0
-  m_DefaultArea: 0
-  m_IgnoreNavMeshAgent: 1
-  m_IgnoreNavMeshObstacle: 1
-  m_OverrideTileSize: 0
-  m_TileSize: 256
-  m_OverrideVoxelSize: 0
-  m_VoxelSize: 0.016666668
-  m_BuildHeightMesh: 0
-  m_NavMeshData: {fileID: 0}
---- !u!114 &114282310593842400
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1426205423038878}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_AgentTypeID: 0
-  m_CollectObjects: 0
-  m_Size: {x: 10, y: 10, z: 10}
-  m_Center: {x: 0, y: 2, z: 0}
-  m_LayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_UseGeometry: 0
+  m_UseGeometry: 1
   m_DefaultArea: 0
   m_IgnoreNavMeshAgent: 1
   m_IgnoreNavMeshObstacle: 1
@@ -562,3 +463,33 @@ MonoBehaviour:
   duration: 0.3
   initialPosition: {x: -5, y: 0, z: 0}
   finalPosition: {x: 0, y: 0, z: 0}
+--- !u!208 &208033461792916874
+NavMeshObstacle:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880114659838812}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.13100001, y: 0.028, z: 0.178}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0.13100001, y: -0.020000001, z: 0.178}
+  m_TimeToStationary: 0.5
+--- !u!208 &208530294129741910
+NavMeshObstacle:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1154199880068106}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.50100005, y: 0.025, z: 0.201}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0, y: -0.010000001, z: 0.201}
+  m_TimeToStationary: 0.5

Assets/Scenes/Game.unity

@@ -619,12 +619,12 @@ Prefab:
     - target: {fileID: 224645339591872550, guid: a9b7d3acafce5684fbefff1148aa6992,
         type: 2}
       propertyPath: m_LocalPosition.x
-      value: 480
+      value: 369.5
       objectReference: {fileID: 0}
     - target: {fileID: 224645339591872550, guid: a9b7d3acafce5684fbefff1148aa6992,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 320
+      value: 299.5
       objectReference: {fileID: 0}
     - target: {fileID: 224645339591872550, guid: a9b7d3acafce5684fbefff1148aa6992,
         type: 2}

Assets/Scripts/Employee/EmployeeAnimationController.cs

@@ -9,42 +9,66 @@ void Start()
 
   public void WalkAnim()
   {
-    animatorController.CrossFade("Walking", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Walking", 0.0f);
+    }
   }
 
   public void IdleAnim()
   {
-    animatorController.CrossFade("Idle", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Idle", 0.0f);
+    }
   }
 
   public void IdleAnim2()
   {
-    animatorController.CrossFade("Idle2", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Idle2", 0.0f);
+    }
   }
 
   public void IdleAnim3()
   {
-    animatorController.CrossFade("Idle3", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Idle3", 0.0f);
+    }
   }
 
   public void WorkAnim()
   {
-    animatorController.CrossFade("Working", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Working", 0.0f);
+    }
   }
 
   public void JumpAnim()
   {
-    animatorController.CrossFade("Jump", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Jump", 0.0f);
+    }
   }
 
   public void DestroyAnim()
   {
-    animatorController.CrossFade("Destroy", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Destroy", 0.0f);
+    }
   }
 
   public void RunAnim()
   {
-    animatorController.CrossFade("Run", 0.0f);
+    if(animatorController != null)
+    {
+      animatorController.CrossFade("Run", 0.0f);
+    }
   }
 
   private Animator animatorController;	

Assets/Scripts/NavMeshComponents/NavMeshController.cs

@@ -37,9 +37,12 @@ void Update()
   public void NavigateTo(Transform target, float speed, OnNavigateFinished del)
   {
     this.target = target;
-    agent.isStopped = false;
-    agent.speed = speed;
-    agent.destination = target.position;
+    if(agent != null)
+    {
+      agent.destination = target.position;
+      agent.speed = speed;
+      agent.isStopped = false;
+    }
     NavigateFinishedCallback = del;
   }
 

ProjectSettings/GraphicsSettings.asset

@@ -35,6 +35,8 @@ 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}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/ProjectSettings.asset

@@ -123,7 +123,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0
+  bundleVersion: 1.0.0
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -147,7 +147,8 @@ PlayerSettings:
   resolutionScalingMode: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
-  applicationIdentifier: {}
+  applicationIdentifier:
+    Standalone: com.ludum.dare.40.hellawork
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 16