Merge branch 'level2' into 'development'

Level2 See merge request !2

Merge branch 'level2' into 'development'
ac23c5fc · Eko Simanjuntak · ceed8ef4 · 7a58ea3a · ac23c5fc · ac23c5fc
Commit ac23c5fc authored Jan 06, 2018 by Eko Simanjuntak
24 changed files
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <LangVersion>4</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <RootNamespace></RootNamespace>
+    <ProjectGuid>{FD8FFE39-2109-6B53-27E5-017F6E85FDAE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AssemblyName>Assembly-CSharp</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <BaseDirectory>Assets</BaseDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Temp\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_1_1;UNITY_2017_1;UNITY_2017;PLATFORM_ARCH_64;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_RUNTIME_NAVMESH_BUILDING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0169</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Temp\bin\Release\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0169</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="UnityEngine">
+      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor">
+      <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+     <Compile Include="Assets\Scripts\BackgroundChanger.cs" />
+     <Compile Include="Assets\Scripts\CameraController.cs" />
+     <Compile Include="Assets\Scripts\PhysicObject.cs" />
+     <Compile Include="Assets\Scripts\PlayerController.cs" />
+     <Compile Include="Assets\Scripts\SceneLoader.cs" />
+     <None Include="Assets\Fonts\eutemia-i\1001fonts-eutemia-i-eula.txt" />
+     <None Include="Assets\Fonts\carolingia-bigfoot\LEAME YA MISMO.txt" />
+     <None Include="Assets\Fonts\pecita\Pecita.txt" />
+ <Reference Include="UnityEngine.UI">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine.Networking">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine.TestRunner">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
+ </Reference>
+ <Reference Include="nunit.framework">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine.Timeline">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine.Analytics">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine.HoloLens">
+ <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
+ </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/Assets/Materials.meta
+++ b/Assets/Materials.meta
+fileFormatVersion: 2
+guid: c16139c0761567944a470fe50f2251ec
+folderAsset: yes
+timeCreated: 1512640972
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/Blue.mat
+++ b/Assets/Materials/Blue.mat
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Blue
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.26794982, g: 0.4954212, b: 0.86764705, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/Blue.mat.meta
+++ b/Assets/Materials/Blue.mat.meta
+fileFormatVersion: 2
+guid: cd617ae1fdd3b754184765634927ba7f
+timeCreated: 1512640984
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/Green.mat
+++ b/Assets/Materials/Green.mat
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Green
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.04346884, g: 0.9852941, b: 0.40071294, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/Green.mat.meta
+++ b/Assets/Materials/Green.mat.meta
+fileFormatVersion: 2
+guid: 1de9841fcbc74624db4bf9dcd72bd222
+timeCreated: 1512641117
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Level 2.unity
+++ b/Assets/Scenes/Level 2.unity
--- a/Assets/Scripts/BackgroundChanger.cs
+++ b/Assets/Scripts/BackgroundChanger.cs
@@ -4,23 +4,24 @@ using UnityEngine;
 public class BackgroundChanger : MonoBehaviour {
-    private List<GameObject> backgroundGroup = new List<GameObject>();
+	private List<GameObject> backgroundGroup = new List<GameObject>();
-    private List<GameObject> obstacleGroup = new List<GameObject>();
+	private List<GameObject> obstacleGroup = new List<GameObject>();
-    private GameObject[] gameObjectGroup;
+	private GameObject[] gameObjectGroup;
-    private GameObject background;
+	private GameObject background;
-    private string[] colors = {"Blue", "Green" };
+	private string[] colors = {"Blue", "Green" };
-    public void Start()
-    {
-        CollectBackgrounds();
-        CollectObstacles();
-        UpdateBackgroud(colors[0]);
-    }
-    private void CollectBackgrounds()
+	public void Start()
-    {
+	{
-        background = GameObject.FindWithTag("Background");
+		CollectBackgrounds();
-    }
+		CollectObstacles();
+		UpdateBackgroud(colors[0]);
+	}
+	private void CollectBackgrounds()
+	{
+		background = GameObject.FindWithTag("Background");
+	}
    private void CollectObstacles()
    {
@@ -33,42 +34,42 @@ public class BackgroundChanger : MonoBehaviour {
            }
        }
    }
+	public void Update()
+	{
+		if (Input.GetKey(KeyCode.X))
+		{
+			UpdateBackgroud("Blue");
+		} else if (Input.GetKey(KeyCode.Z))
+		{
+			UpdateBackgroud("Green");
+		}
+	}
+	public void UpdateBackgroud(string tagColor)
+	{
+		if(tagColor == "Green")
+		{
+			background.GetComponent<SpriteRenderer>().color = new Color32(46, 204, 113, 255);
+		} else if (tagColor == "Blue")
+		{
+			background.GetComponent<SpriteRenderer>().color = new Color32(65, 131, 215, 255);
+		}
+		UpdateObstacle(tagColor);
+	}
-    public void Update()
+	private void UpdateObstacle(string tagColor)
-    {
+	{ 
-        if (Input.GetKey(KeyCode.X))
+		foreach (GameObject obstacle in obstacleGroup)
-        {
+		{
-            UpdateBackgroud("Blue");
+			if (obstacle.tag == tagColor + "Obstacle")
-        } else if (Input.GetKey(KeyCode.Z))
+			{
-        {
+				obstacle.SetActive(false);
-            UpdateBackgroud("Green");
+			} else
-        }
+			{
-    }
+				obstacle.SetActive(true);
+			}
-    public void UpdateBackgroud(string tagColor)
+		}
-    {
+	}
-        if(tagColor == "Green")
-        {
-            background.GetComponent<SpriteRenderer>().color = new Color32(46, 204, 113, 255);
-        } else if (tagColor == "Blue")
-        {
-            background.GetComponent<SpriteRenderer>().color = new Color32(65, 131, 215, 255);
-        }
-        UpdateObstacle(tagColor);
-    }
-    private void UpdateObstacle(string tagColor)
-    { 
-        foreach (GameObject obstacle in obstacleGroup)
-        {
-            if (obstacle.tag == tagColor + "Obstacle")
-            {
-                obstacle.SetActive(false);
-            } else
-            {
-                obstacle.SetActive(true);
-            }
-        }
-    }
 }
--- a/Assets/Sound.meta
+++ b/Assets/Sound.meta
+fileFormatVersion: 2
+guid: f37c04c6468a0e94fbfa740f81cc4715
+folderAsset: yes
+timeCreated: 1513043395
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sound/Footsteps Sound Effect Royalty Free.mp3
+++ b/Assets/Sound/Footsteps Sound Effect Royalty Free.mp3
--- a/Assets/Sound/Footsteps Sound Effect Royalty Free.mp3.meta
+++ b/Assets/Sound/Footsteps Sound Effect Royalty Free.mp3.meta
+fileFormatVersion: 2
+guid: 6824473fc47f5bd48881d709538e6838
+timeCreated: 1513044226
+licenseType: Free
+AudioImporter:
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sound/limbo.mp3
+++ b/Assets/Sound/limbo.mp3
--- a/Assets/Sound/limbo.mp3.meta
+++ b/Assets/Sound/limbo.mp3.meta
+fileFormatVersion: 2
+guid: f09cf9ce8a5eb864f92f459495d6fe62
+timeCreated: 1513046318
+licenseType: Free
+AudioImporter:
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Animations/player.controller
+++ b/Assets/Sprites/Animations/player.controller
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: player
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107133705209728296}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &1102564099835384132
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Player_Run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: b3be3902ee635c145b9bc8e7f5434d42, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1107 &1107133705209728296
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102564099835384132}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102564099835384132}
--- a/Assets/Sprites/Animations/player.controller.meta
+++ b/Assets/Sprites/Animations/player.controller.meta
+fileFormatVersion: 2
+guid: a16566a6ce6ba9a44876de4d28e11422
+timeCreated: 1512582417
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Animations/shadow-boy-game-character-sprite-sheet-sidescroller-limbo-stickman-game-asset-flying-flappy-animation-gui-mobile-games-gameart-game-art-590.gif
+++ b/Assets/Sprites/Animations/shadow-boy-game-character-sprite-sheet-sidescroller-limbo-stickman-game-asset-flying-flappy-animation-gui-mobile-games-gameart-game-art-590.gif
--- a/Assets/Sprites/Animations/shadow-boy-game-character-sprite-sheet-sidescroller-limbo-stickman-game-asset-flying-flappy-animation-gui-mobile-games-gameart-game-art-590.gif.meta
+++ b/Assets/Sprites/Animations/shadow-boy-game-character-sprite-sheet-sidescroller-limbo-stickman-game-asset-flying-flappy-animation-gui-mobile-games-gameart-game-art-590.gif.meta
+fileFormatVersion: 2
+guid: 1c2f3df13d9276d48bde164b00bd9c60
+timeCreated: 1513047512
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -7,6 +7,9 @@ TagManager:
  - BlueObstacle
  - GreenObstacle
  - Background
+  - BlueBackground
+  - GreenBackground
+  - WhiteObstacle
  layers:
  - Default
  - TransparentFX

--- a/colourful-love.sln
+++ b/colourful-love.sln
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "colourful-love", "Assembly-CSharp.csproj", "{FD8FFE39-2109-6B53-27E5-017F6E85FDAE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FD8FFE39-2109-6B53-27E5-017F6E85FDAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD8FFE39-2109-6B53-27E5-017F6E85FDAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD8FFE39-2109-6B53-27E5-017F6E85FDAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD8FFE39-2109-6B53-27E5-017F6E85FDAE}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
+EndGlobal
--- a/colourful-love.userprefs
+++ b/colourful-love.userprefs
@@ -2,7 +2,7 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\BackgroundChanger.cs">
    <Files>
-      <File FileName="Assets\Scripts\BackgroundChanger.cs" Line="22" Column="1" />
+      <File FileName="Assets\Scripts\BackgroundChanger.cs" Line="7" Column="1" />
      <File FileName="Assets\Scripts\PlayerController.cs" Line="1" Column="1" />
      <File FileName="Assets\Scripts\PhysicObject.cs" Line="1" Column="1" />
      <File FileName="Assets\Scripts\SceneLoader.cs" Line="1" Column="1" />

--- a/obj/Debug/Assembly-CSharp.csproj.FileListAbsolute.txt
+++ b/obj/Debug/Assembly-CSharp.csproj.FileListAbsolute.txt
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\obj\Debug\Assembly-CSharp.csprojResolveAssemblyReference.cache
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Assembly-CSharp.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Assembly-CSharp.pdb
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\nunit.framework.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEditor.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.Analytics.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.HoloLens.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.Networking.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.TestRunner.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.Timeline.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.UI.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Mono.Cecil.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Unity.SerializationLogic.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Unity.DataContract.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\ExCSS.Unity.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Unity.Legacy.NRefactory.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Unity.UNetWeaver.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Unity.CecilTools.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Mono.Cecil.Pdb.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\Mono.Cecil.Mdb.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEditor.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.UI.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.Networking.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.TestRunner.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\nunit.framework.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.Timeline.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.Analytics.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\Temp\bin\Debug\UnityEngine.HoloLens.xml
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\obj\Debug\Assembly-CSharp.dll
+D:\Kuliah\Semester 5\PAG\Project\Proyek Akhir II\colourful-love\obj\Debug\Assembly-CSharp.pdb
--- a/obj/Debug/Assembly-CSharp.csprojResolveAssemblyReference.cache
+++ b/obj/Debug/Assembly-CSharp.csprojResolveAssemblyReference.cache
--- a/obj/Debug/Assembly-CSharp.dll
+++ b/obj/Debug/Assembly-CSharp.dll
--- a/obj/Debug/Assembly-CSharp.pdb
+++ b/obj/Debug/Assembly-CSharp.pdb