diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/.suo b/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/.suo
index 885d8ef86e0f475f1cce0a8f4a44f06fc6871057..326c64f0fa41f5f6880c878e209fa08bd5616391 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/.suo and b/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/.suo differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/Server/sqlite3/storage.ide b/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/Server/sqlite3/storage.ide
index 92f9d1061ffc9a008f1c043edee3202213876205..8dcac634b9e8942aaa28e596679e7c07466703c7 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/Server/sqlite3/storage.ide and b/Tugas2_PBD_MRizkiFonna_13516001_rev/.vs/Tugas2_PBD_MRizkiFonna_13516001_rev/v16/Server/sqlite3/storage.ide differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/EnemyCtr.cs b/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/EnemyCtr.cs
index d8d08791f5e7b39d0128eedc748024a8b3bdbc17..57cdaff28cf1e8ddca3cb51f1fd2c4939568a88d 100644
--- a/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/EnemyCtr.cs
+++ b/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/EnemyCtr.cs
@@ -1,16 +1,20 @@
using System.Collections;
using System.Collections.Generic;
+//using System.Threading;
using UnityEngine;
public class EnemyCtr : MonoBehaviour
{
- private int player_health = 100;
+ //private int player_health = 100;
private int enemy_health = 100;
+ public int score = 0, i;
+ Rigidbody2D rb;
SpriteRenderer sr;
// Start is called before the first frame update
void Start()
{
sr = GetComponent<SpriteRenderer>();
+ rb = GetComponent<Rigidbody2D>();
}
// Update is called once per frame
@@ -20,6 +24,77 @@ public class EnemyCtr : MonoBehaviour
}
*/
+ private void FixedUpdate()
+ {
+ //Invoke("Sleep", 2);
+ //Thread.Sleep(2000);
+ //rb.velocity = new Vector2(5, 0);
+ //sr.flipX = false;
+ System.Random rand = new System.Random();
+ int r = rand.Next(2);
+ for (i = 1; i <= 5; i++)
+ {
+
+ rb.velocity = new Vector2(-5, rb.velocity.y);
+ sr.flipX = true;
+ }
+ //rb.velocity = new Vector2(5, rb.velocity.y);
+ //sr.flipX = false;
+ /*
+ if (r==0)
+ {
+ int i;
+ for (i=1;i<=100;i++)
+ {
+ rb.velocity = new Vector2(rb.velocity.x + 0.1f, rb.velocity.y);
+ sr.flipX = false;
+ }
+
+ }
+ else
+ {
+ int i;
+ for (i = 1; i <= 100; i++)
+ {
+ rb.velocity = new Vector2(rb.velocity.x-0.1f, rb.velocity.y);
+ sr.flipX = true;
+ }
+
+
+ }
+ */
+
+ /*
+ for (i=1;i<=5;i++)
+ {
+
+ rb.velocity = new Vector2(5, rb.velocity.y);
+ sr.flipX = false;
+ }
+ //i = 0;
+ */
+ /*
+ for (i = 6; i <= 10; i++)
+ {
+
+ rb.velocity = new Vector2(-5, rb.velocity.y);
+ sr.flipX = true;
+ }
+ */
+ /*
+ for (i = 1; i <= 5; i++)
+ {
+
+ Invoke("MoveLeft", 0.5f);
+ }
+ */
+
+
+
+
+
+
+ }
private void OnTriggerEnter2D(Collider2D collision)
{
@@ -31,6 +106,7 @@ public class EnemyCtr : MonoBehaviour
if (enemy_health <=0)
{
Destroy(gameObject);
+ score++;
}
@@ -42,4 +118,20 @@ public class EnemyCtr : MonoBehaviour
}
}
+
+ private void Sleep()
+ {
+
+
+
+ }
+
+ private void MoveLeft()
+ {
+ rb.velocity = new Vector2(-10, rb.velocity.y);
+ sr.flipX = true;
+
+
+ }
+
}
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/PlayerCtr.cs b/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/PlayerCtr.cs
index 1c31498d942fb394d93954e8a7ad474750e6a8f6..fdfda0544bd654d8c975ac63088aaf4e90996329 100644
--- a/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/PlayerCtr.cs
+++ b/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/PlayerCtr.cs
@@ -9,7 +9,8 @@ public class PlayerCtr : MonoBehaviour
Rigidbody2D rb;
SpriteRenderer sr;
Object bltref;
-
+ private int player_health = 100;
+
[SerializeField]
Transform floorCheck;
@@ -133,20 +134,21 @@ public class PlayerCtr : MonoBehaviour
}
- /*
+
private void OnCollisionEnter2D(Collision2D collision)
{
- if (collision.gameObject.CompareTag("Floor"))
+ if (collision.gameObject.CompareTag("Enemy"))
{
//Destroy(gameObject);
- isOnFloor = true;
+ player_health -= 5;
+ if (player_health<=0)
+ {
+ Destroy(gameObject);
+ }
}
- else
- {
- isOnFloor = false;
- }
+
}
- */
+
}
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/Scenes/Main.unity b/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/Scenes/Main.unity
index 66264c0c514326066a081f1a77587ffdcc49ef08..be494d31cd69224e5734a67e41966698ea2e8563 100644
--- a/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/Scenes/Main.unity
+++ b/Tugas2_PBD_MRizkiFonna_13516001_rev/Assets/Scenes/Main.unity
@@ -992,8 +992,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 911141167
+ m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 70fbac840cd6a7d43932ba8d55cad710, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1014,7 +1014,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 991699914}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 6.32, y: 2.73, z: 0}
+ m_LocalPosition: {x: 6.32, y: 2.92, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -1079,6 +1079,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ad41467dc52b01d4caa159e111b2e1ec, type: 3}
m_Name:
m_EditorClassIdentifier:
+ score: 0
+ i: 0
--- !u!1 &1041565893
GameObject:
m_ObjectHideFlags: 0
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/CurrentLayout.dwlt b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/CurrentLayout.dwlt
index 758ca4bae70723136a4613d0245cfeda5241aee2..fdbec95fc4a2b85cf342fa04e8dec625abedfcf2 100644
--- a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/CurrentLayout.dwlt
+++ b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/CurrentLayout.dwlt
@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 6}
- m_MinSize: {x: 950, y: 300}
+ m_MinSize: {x: 950, y: 524}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@@ -74,7 +74,7 @@ MonoBehaviour:
m_MinSize: {x: 232, y: 474}
m_MaxSize: {x: 10002, y: 14024}
vertical: 1
- controlID: 66
+ controlID: 79
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -120,8 +120,8 @@ MonoBehaviour:
y: 0
width: 277
height: 635
- m_MinSize: {x: 277, y: 74}
- m_MaxSize: {x: 4002, y: 4024}
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 19}
@@ -198,10 +198,10 @@ MonoBehaviour:
y: 30
width: 1366
height: 635
- m_MinSize: {x: 957, y: 474}
- m_MaxSize: {x: 22012, y: 14024}
+ m_MinSize: {x: 951, y: 474}
+ m_MaxSize: {x: 22006, y: 14024}
vertical: 0
- controlID: 65
+ controlID: 59
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -244,10 +244,10 @@ MonoBehaviour:
y: 0
width: 504
height: 635
- m_MinSize: {x: 204, y: 448}
- m_MaxSize: {x: 4004, y: 8048}
+ m_MinSize: {x: 204, y: 424}
+ m_MaxSize: {x: 4004, y: 8024}
vertical: 1
- controlID: 131
+ controlID: 60
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -267,8 +267,8 @@ MonoBehaviour:
y: 0
width: 244
height: 635
- m_MinSize: {x: 244, y: 224}
- m_MaxSize: {x: 4004, y: 4024}
+ m_MinSize: {x: 240, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -468,7 +468,7 @@ MonoBehaviour:
m_PersistentViewDataDictionary: {fileID: 0}
m_LockTracker:
m_IsLocked: 0
- m_LastSelectedObjectID: -1700
+ m_LastSelectedObjectID: 9892
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -590,9 +590,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: defbffff
+ m_SelectedIDs: a4260000
+ m_LastClickedID: 9892
+ m_ExpandedIDs: defbffffc8260000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -665,9 +665,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 95}
- m_SelectedIDs: 8e090000
- m_LastClickedID: 2446
- m_ExpandedIDs: 000000008e090000660b0000300c0000c00d0000020e0000f80e00003c110000c0120000ac130000d214000036150000a21b0000d61b00000a1d0000201e0000c4200000d62000000226000000ca9a3b
+ m_SelectedIDs: 8a090000
+ m_LastClickedID: 2442
+ m_ExpandedIDs: 000000008a090000620b00002c0c0000bc0d0000fe0d0000f40e000038110000bc120000a8130000ce140000321500009e1b0000d21b0000061d00001c1e0000c0200000d2200000fe25000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -695,7 +695,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 000000008e090000660b0000300c0000c00d0000020e0000f80e00003c110000c0120000ac130000d214000036150000a21b0000d61b00000a1d0000201e0000c4200000d620000002260000
+ m_ExpandedIDs: 000000008a090000620b00002c0c0000bc0d0000fe0d0000f40e000038110000bc120000a8130000ce140000321500009e1b0000d21b0000061d00001c1e0000c0200000d2200000fe250000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -722,7 +722,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 0
+ m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: f6280000e02800007c29000064290000362b0000962900000e2a0000322a00002a2a0000462a0000da2900006235000082650000626600001c45000018450000
m_RenameOverlay:
m_UserAcceptedRename: 0
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.dll b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.dll
index 22684fb3a208e2505ac61e8a369daf983ec02be1..6d2fb74dacf198e691340b6a0b8742108da7a1fd 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.pdb
index 3973b65d1eaaa498e2dc7f815f7f9469e06bdb79..fcea28dd807a26a54bc1cd0be777b53b68aa2279 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/ScriptAssemblies/Assembly-CSharp.pdb differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/assetDatabase3 b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/assetDatabase3
index 9d4734cfac6d2a35c08b048609e0514f5318fa81..02ad36c45d8b0a4045d38caae50957bcf409a105 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/assetDatabase3 and b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/assetDatabase3 differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/ad/ad41467dc52b01d4caa159e111b2e1ec b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/ad/ad41467dc52b01d4caa159e111b2e1ec
index dbad6e8dfc3233cf0aac6856a75f11b37532de31..a5a3a30c45d52830afac2d2261f1fae94329edda 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/ad/ad41467dc52b01d4caa159e111b2e1ec and b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/ad/ad41467dc52b01d4caa159e111b2e1ec differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/b4/b43726a3c26a16543b3d30ba4ab424c8 b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/b4/b43726a3c26a16543b3d30ba4ab424c8
index 89882aa2573748205bcbe558ddca3e5b75c58492..39a7b10f5e1b4c67cecf9c13c0e1c67f50e4d079 100644
Binary files a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/b4/b43726a3c26a16543b3d30ba4ab424c8 and b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/metadata/b4/b43726a3c26a16543b3d30ba4ab424c8 differ
diff --git a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/shadercompiler-UnityShaderCompiler.exe0.log
index e12e373ce9fa75673ed7f397a8abc2cea0b7f83b..eb44932fc899409d58e30f6df33f1738051e80ce 100644
--- a/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/Tugas2_PBD_MRizkiFonna_13516001_rev/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -4,3 +4,92 @@ Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler