Skip to content

C
colourful-love
Commit d2b526db by Eko Simanjuntak
Options

Merge branch 'level5' into 'development'

Level5 See merge request !7
parents 89f9ea01 217cddd9
Showing with 50 additions and 29 deletions
Assets/Scenes/Level 3.unity
...@@ -948,7 +948,7 @@ Transform: ...@@ -948,7 +948,7 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 173643953} m_GameObject: {fileID: 173643953}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 153.7, y: 9.877106, z: 0} m_LocalPosition: {x: 147.3, y: 9.877106, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 470275807} m_Father: {fileID: 470275807}
...@@ -1911,11 +1911,11 @@ Transform: ...@@ -1911,11 +1911,11 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 307313277} m_GameObject: {fileID: 307313277}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 90.12, y: -1.51, z: 0} m_LocalPosition: {x: 90.12, y: -3.2, z: 0}
m_LocalScale: {x: 0.30039, y: 0.15958999, z: 1} m_LocalScale: {x: 0.30039, y: 0.15958999, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 470275807}
m_RootOrder: 9 m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &308390349 --- !u!1 &308390349
GameObject: GameObject:
...@@ -3091,6 +3091,9 @@ Transform: ...@@ -3091,6 +3091,9 @@ Transform:
- {fileID: 485851931} - {fileID: 485851931}
- {fileID: 173643956} - {fileID: 173643956}
- {fileID: 324999447} - {fileID: 324999447}
- {fileID: 307313280}
- {fileID: 2020557928}
- {fileID: 557869958}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -3450,11 +3453,11 @@ Transform: ...@@ -3450,11 +3453,11 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 557869955} m_GameObject: {fileID: 557869955}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 85.34, y: 0.64, z: 0} m_LocalPosition: {x: 85.34, y: -1.0500001, z: 0}
m_LocalScale: {x: 0.30039, y: 0.15958999, z: 1} m_LocalScale: {x: 0.30039, y: 0.15958999, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 470275807}
m_RootOrder: 11 m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &594882488 --- !u!1 &594882488
GameObject: GameObject:
...@@ -9346,11 +9349,11 @@ Transform: ...@@ -9346,11 +9349,11 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2020557925} m_GameObject: {fileID: 2020557925}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 91.44, y: 2.55, z: 0} m_LocalPosition: {x: 91.44, y: 0.8599999, z: 0}
m_LocalScale: {x: 0.30039, y: 0.15958999, z: 1} m_LocalScale: {x: 0.30039, y: 0.15958999, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 470275807}
m_RootOrder: 10 m_RootOrder: 35
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2022861151 --- !u!1 &2022861151
GameObject: GameObject:
......
Assets/Scenes/Level 5.unity
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Scenes/Menu.unity
...@@ -208,7 +208,7 @@ RectTransform: ...@@ -208,7 +208,7 @@ RectTransform:
m_GameObject: {fileID: 514988942} m_GameObject: {fileID: 514988942}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: m_Children:
- {fileID: 1774161681} - {fileID: 1774161681}
m_Father: {fileID: 1419168547} m_Father: {fileID: 1419168547}
...@@ -216,7 +216,7 @@ RectTransform: ...@@ -216,7 +216,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 392, y: -319} m_AnchoredPosition: {x: 315, y: -235}
m_SizeDelta: {x: 235.1, y: 179.7} m_SizeDelta: {x: 235.1, y: 179.7}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &514988944 --- !u!114 &514988944
...@@ -330,7 +330,7 @@ RectTransform: ...@@ -330,7 +330,7 @@ RectTransform:
m_GameObject: {fileID: 904575931} m_GameObject: {fileID: 904575931}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: m_Children:
- {fileID: 1886889952} - {fileID: 1886889952}
m_Father: {fileID: 1419168547} m_Father: {fileID: 1419168547}
...@@ -338,7 +338,7 @@ RectTransform: ...@@ -338,7 +338,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -397.3, y: -319.00003} m_AnchoredPosition: {x: -214, y: -235}
m_SizeDelta: {x: 235.1, y: 179.7} m_SizeDelta: {x: 235.1, y: 179.7}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &904575933 --- !u!114 &904575933
...@@ -452,7 +452,7 @@ RectTransform: ...@@ -452,7 +452,7 @@ RectTransform:
m_GameObject: {fileID: 1119512936} m_GameObject: {fileID: 1119512936}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: m_Children:
- {fileID: 1356066943} - {fileID: 1356066943}
m_Father: {fileID: 1419168547} m_Father: {fileID: 1419168547}
...@@ -460,9 +460,9 @@ RectTransform: ...@@ -460,9 +460,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 21.100014, y: -319.00003} m_AnchoredPosition: {x: 137, y: -235}
m_SizeDelta: {x: 235.1, y: 179.7} m_SizeDelta: {x: 235.1, y: 179.7}
m_Pivot: {x: 0.040888563, y: 0.5} m_Pivot: {x: 0.5000001, y: 0.5}
--- !u!114 &1119512938 --- !u!114 &1119512938
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -571,8 +571,8 @@ Transform: ...@@ -571,8 +571,8 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1186508283} m_GameObject: {fileID: 1186508283}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 2.34, z: 0} m_LocalPosition: {x: 0.572, y: 0.03, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.5654351, y: 0.49929425, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2144222864} m_Father: {fileID: 2144222864}
m_RootOrder: 0 m_RootOrder: 0
...@@ -645,7 +645,7 @@ RectTransform: ...@@ -645,7 +645,7 @@ RectTransform:
m_GameObject: {fileID: 1251802330} m_GameObject: {fileID: 1251802330}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: m_Children:
- {fileID: 282951666} - {fileID: 282951666}
m_Father: {fileID: 1419168547} m_Father: {fileID: 1419168547}
...@@ -653,7 +653,7 @@ RectTransform: ...@@ -653,7 +653,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -134.59998, y: -319} m_AnchoredPosition: {x: -42, y: -235}
m_SizeDelta: {x: 235.1, y: 179.7} m_SizeDelta: {x: 235.1, y: 179.7}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1251802332 --- !u!114 &1251802332
...@@ -1288,7 +1288,7 @@ Transform: ...@@ -1288,7 +1288,7 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2144222862} m_GameObject: {fileID: 2144222862}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.4261247, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1186508284} - {fileID: 1186508284}
......
Assets/Scenes/Stories.unity
...@@ -142,7 +142,7 @@ RectTransform: ...@@ -142,7 +142,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -372, y: -315} m_AnchoredPosition: {x: -272, y: -255}
m_SizeDelta: {x: 210, y: 140} m_SizeDelta: {x: 210, y: 140}
m_Pivot: {x: -0.083567515, y: 0.38915473} m_Pivot: {x: -0.083567515, y: 0.38915473}
--- !u!114 &382978306 --- !u!114 &382978306
...@@ -383,8 +383,8 @@ Transform: ...@@ -383,8 +383,8 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 443434355} m_GameObject: {fileID: 443434355}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -580.329, y: -258.056, z: 0} m_LocalPosition: {x: -577.708, y: -258.166, z: 0}
m_LocalScale: {x: 0.9233739, y: 0.9233739, z: 0.9233739} m_LocalScale: {x: 0.689829, y: 0.8345647, z: 0.9233739}
m_Children: [] m_Children: []
m_Father: {fileID: 437167784} m_Father: {fileID: 437167784}
m_RootOrder: 0 m_RootOrder: 0
......
Assets/Scripts/BackgroundChanger.cs
...@@ -4,11 +4,12 @@ using UnityEngine; ...@@ -4,11 +4,12 @@ using UnityEngine;
public class BackgroundChanger : MonoBehaviour { 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", "Yellow" }; private string[] colors = {"Blue", "Green", "Yellow", "Purple" };
public void Start() public void Start()
{ {
...@@ -45,6 +46,9 @@ public class BackgroundChanger : MonoBehaviour { ...@@ -45,6 +46,9 @@ public class BackgroundChanger : MonoBehaviour {
} else if (Input.GetKey(KeyCode.C)) } else if (Input.GetKey(KeyCode.C))
{ {
UpdateBackgroud("Yellow"); UpdateBackgroud("Yellow");
} else if (Input.GetKey(KeyCode.V))
{
UpdateBackgroud("Purple");
} }
} }
...@@ -59,6 +63,9 @@ public class BackgroundChanger : MonoBehaviour { ...@@ -59,6 +63,9 @@ public class BackgroundChanger : MonoBehaviour {
} else if (tagColor == "Yellow") } else if (tagColor == "Yellow")
{ {
background.GetComponent<SpriteRenderer>().color = new Color32(255, 193, 7, 255); background.GetComponent<SpriteRenderer>().color = new Color32(255, 193, 7, 255);
} else if (tagColor == "Purple")
{
background.GetComponent<SpriteRenderer>().color = new Color32(191, 85, 236, 255);
} }
......
Assets/Sound/Sprites/Animations/player.controller.meta
fileFormatVersion: 2 fileFormatVersion: 2
guid: a16566a6ce6ba9a44876de4d28e11422 guid: 4bc62546e2a637649a2748bbeb872065
timeCreated: 1512582417 timeCreated: 1512582417
licenseType: Free licenseType: Free
NativeFormatImporter: NativeFormatImporter:
......
Assets/Sound/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 fileFormatVersion: 2
guid: 1c2f3df13d9276d48bde164b00bd9c60 guid: f54cd7261f6305d488ae90d958a9aa0d
timeCreated: 1513047512 timeCreated: 1513047512
licenseType: Free licenseType: Free
TextureImporter: TextureImporter:
......
ProjectSettings/EditorBuildSettings.asset
...@@ -26,3 +26,9 @@ EditorBuildSettings: ...@@ -26,3 +26,9 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Level 5.unity path: Assets/Scenes/Level 5.unity
guid: 131effb69f163c2499133e536b4a4536 guid: 131effb69f163c2499133e536b4a4536
- enabled: 1
path: Assets/Scenes/Stories.unity
guid: c41f6fa246c68454384e609ef4e40930
- enabled: 1
path: Assets/Scenes/Tutorials.unity
guid: 4e4a4af12f474bc40adf1774a8167c3f
ProjectSettings/TagManager.asset
...@@ -3,7 +3,12 @@ ...@@ -3,7 +3,12 @@
--- !u!78 &1 --- !u!78 &1
TagManager: TagManager:
serializedVersion: 2 serializedVersion: 2
tags: [] tags:
- BlueObstacle
- YellowObstacle
- GreenObstacle
- Background
- PurpleObstacle
layers: layers:
- Default - Default
- TransparentFX - TransparentFX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment