diff --git a/Assets/Action/PlayerInput.cs b/Assets/Action/PlayerInput.cs
index 68d50b612b3af03a947a9295acdf099ba5c424e5..2ac30be05986749618e7df84014f88fe82abbe6c 100644
--- a/Assets/Action/PlayerInput.cs
+++ b/Assets/Action/PlayerInput.cs
@@ -156,6 +156,61 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": true
},
+ {
+ ""name"": ""Controller"",
+ ""id"": ""6d5b2fa1-1eac-4c1e-a54e-78d64a695a13"",
+ ""path"": ""2DVector"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Move"",
+ ""isComposite"": true,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": ""up"",
+ ""id"": ""16691111-e049-4a34-b6dd-c3273b40f120"",
+ ""path"": ""<XInputController>/leftStick/up"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Move"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""down"",
+ ""id"": ""8e6954e8-7bad-4ae1-8c94-7179cec4aa43"",
+ ""path"": ""<XInputController>/leftStick/down"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Move"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""left"",
+ ""id"": ""558a8864-bcab-4eb9-a876-1fa989835b9f"",
+ ""path"": ""<XInputController>/leftStick/left"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Move"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""right"",
+ ""id"": ""0a4f987f-6a3a-4937-bba2-5f8cc852584e"",
+ ""path"": ""<XInputController>/leftStick/right"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Move"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
{
""name"": """",
""id"": ""b33bf0e1-367d-4049-a986-ec3d1ae32ead"",
@@ -167,6 +222,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
+ {
+ ""name"": """",
+ ""id"": ""ce060ecb-de31-4307-9240-8f241cf2491b"",
+ ""path"": ""<Gamepad>/buttonSouth"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Jump"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": """",
""id"": ""3f474a4e-e351-42e3-ac2b-4a6fa64960f8"",
@@ -178,6 +244,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
+ {
+ ""name"": """",
+ ""id"": ""031edcd3-97ca-4e70-9aec-88e6c6587695"",
+ ""path"": ""<Gamepad>/rightStick"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""MoveDirection"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": """",
""id"": ""988245e9-5c12-424b-b725-b47ddeeb293f"",
@@ -189,6 +266,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
+ {
+ ""name"": """",
+ ""id"": ""021c340d-1473-4136-a89d-147793b2f672"",
+ ""path"": ""<Gamepad>/buttonSouth"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Interact"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": """",
""id"": ""0917a77f-a550-4878-af94-790d0e95c240"",
@@ -200,6 +288,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
+ {
+ ""name"": """",
+ ""id"": ""9f110a03-2a71-4d9f-b908-861cb22f089a"",
+ ""path"": ""<Gamepad>/buttonWest"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""OpenShop"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": """",
""id"": ""d1e54374-26d3-40af-ade2-76427c127d43"",
@@ -211,6 +310,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
+ {
+ ""name"": """",
+ ""id"": ""88c55a1c-4e92-461e-b555-ad8df50fc6ae"",
+ ""path"": ""<Gamepad>/rightTrigger"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Attack"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": """",
""id"": ""1fbd979b-95de-4068-8a75-897a1236c0ff"",
@@ -222,6 +332,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
+ {
+ ""name"": """",
+ ""id"": ""4f37c44e-9cad-4306-88ae-e03a7da7e9d5"",
+ ""path"": ""<Gamepad>/buttonEast"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Inspect"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": """",
""id"": ""3a5ec151-af16-41f2-97a8-7c68d46739c9"",
@@ -232,6 +353,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""action"": ""Skip"",
""isComposite"": false,
""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""5d8b0adb-dce8-4759-ad8a-ff4c1720f288"",
+ ""path"": ""<Gamepad>/buttonNorth"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Skip"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
}
]
}
diff --git a/Assets/Action/PlayerInput.inputactions b/Assets/Action/PlayerInput.inputactions
index 98f45b623c85fb73c3a9e208e82f752ed41dbe98..56f7b1f80987e433d0a52f405f0cf49f4dcc8730 100644
--- a/Assets/Action/PlayerInput.inputactions
+++ b/Assets/Action/PlayerInput.inputactions
@@ -134,6 +134,61 @@
"isComposite": false,
"isPartOfComposite": true
},
+ {
+ "name": "Controller",
+ "id": "6d5b2fa1-1eac-4c1e-a54e-78d64a695a13",
+ "path": "2DVector",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Move",
+ "isComposite": true,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "up",
+ "id": "16691111-e049-4a34-b6dd-c3273b40f120",
+ "path": "<XInputController>/leftStick/up",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Move",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "down",
+ "id": "8e6954e8-7bad-4ae1-8c94-7179cec4aa43",
+ "path": "<XInputController>/leftStick/down",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Move",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "left",
+ "id": "558a8864-bcab-4eb9-a876-1fa989835b9f",
+ "path": "<XInputController>/leftStick/left",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Move",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "right",
+ "id": "0a4f987f-6a3a-4937-bba2-5f8cc852584e",
+ "path": "<XInputController>/leftStick/right",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Move",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
{
"name": "",
"id": "b33bf0e1-367d-4049-a986-ec3d1ae32ead",
@@ -145,6 +200,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "ce060ecb-de31-4307-9240-8f241cf2491b",
+ "path": "<Gamepad>/buttonSouth",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Jump",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "3f474a4e-e351-42e3-ac2b-4a6fa64960f8",
@@ -156,6 +222,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "031edcd3-97ca-4e70-9aec-88e6c6587695",
+ "path": "<Gamepad>/rightStick",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "MoveDirection",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "988245e9-5c12-424b-b725-b47ddeeb293f",
@@ -167,6 +244,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "021c340d-1473-4136-a89d-147793b2f672",
+ "path": "<Gamepad>/buttonSouth",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Interact",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "0917a77f-a550-4878-af94-790d0e95c240",
@@ -178,6 +266,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "9f110a03-2a71-4d9f-b908-861cb22f089a",
+ "path": "<Gamepad>/buttonWest",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "OpenShop",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "d1e54374-26d3-40af-ade2-76427c127d43",
@@ -189,6 +288,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "88c55a1c-4e92-461e-b555-ad8df50fc6ae",
+ "path": "<Gamepad>/rightTrigger",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Attack",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "1fbd979b-95de-4068-8a75-897a1236c0ff",
@@ -200,6 +310,17 @@
"isComposite": false,
"isPartOfComposite": false
},
+ {
+ "name": "",
+ "id": "4f37c44e-9cad-4306-88ae-e03a7da7e9d5",
+ "path": "<Gamepad>/buttonEast",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Inspect",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "",
"id": "3a5ec151-af16-41f2-97a8-7c68d46739c9",
@@ -210,6 +331,17 @@
"action": "Skip",
"isComposite": false,
"isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "5d8b0adb-dce8-4759-ad8a-ff4c1720f288",
+ "path": "<Gamepad>/buttonNorth",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Skip",
+ "isComposite": false,
+ "isPartOfComposite": false
}
]
}
diff --git a/Assets/Scripts/Menu/PauseMenu.cs b/Assets/Scripts/Menu/PauseMenu.cs
index 1f00e3cc5e75d11fb120b0ffbe5fea51d9104e41..15f9bae8f2c0eabf51eea5323c082f33cf085f38 100644
--- a/Assets/Scripts/Menu/PauseMenu.cs
+++ b/Assets/Scripts/Menu/PauseMenu.cs
@@ -28,12 +28,18 @@ public class PauseMenu : MonoBehaviour
pauseMenuUI.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
+
+ Cursor.lockState = CursorLockMode.None;
+ Cursor.visible = true;
}
public void Resume()
{
pauseMenuUI.SetActive(false);
Time.timeScale = 1f;
GameIsPaused = false;
+
+ Cursor.lockState = CursorLockMode.Locked;
+ Cursor.visible = false;
}
public void GoMainMenuAndSave()
diff --git a/README.md b/README.md
index bd606b26d64bab127b9aee2c9b7db357863bde79..24eec13ba7bd1b9f61ef923d03571b47b6e5e3df 100644
--- a/README.md
+++ b/README.md
@@ -2,92 +2,119 @@
-## Getting started
+## Deskripsi Aplikasi
+Aplikasi ini adalah game bertema survival shooter
+yang dikembangkan menggunakan Unity. pada game ini terdapat 4 level dan
+3 cutscene. Setiap level yang telah diselesaikan akan memberikan reward
+yang bisa digunakan di shopkeeper. terdapat juga 3 cutscene yaitu
+Beginning cutscene, Death cutscene, dan Ending cutscene.
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+Pada Level 1 player memiliki quest untuk membunuh 10 keroco
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+Pada level 2 player memiliki quest untuk membunuh 5 keroco dan 4 kepala keroco
-## Add your files
+Pada level 3 player memiliki quest untuk membunuh 4 kepala keroco dan 1 jendral
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+Pada level 4 player memiliki quest untuk membunuh 2 kepala keroco 2 jendral dan 1 king
-```
-cd existing_repo
-git remote add origin https://gitlab.informatika.org/fachrgab/if3210-2024-unity-bdm.git
-git branch -M main
-git push -uf origin main
-```
+## Library yang digunakan
-## Integrate with your tools
+Aplikasi ini dibuat menggunakan library bawaan unity dan C#
-- [ ] [Set up project integrations](https://gitlab.informatika.org/fachrgab/if3210-2024-unity-bdm/-/settings/integrations)
-## Collaborate with your team
+## Screenshot aplikasi
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+Main menu
-## Test and Deploy
+
-Use the built-in continuous integration in GitLab.
+Level 1
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+
-***
+Level 2
-# Editing this README
+
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
+Level 3
-## Suggestions for a good README
+
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+Level 4
-## Name
-Choose a self-explaining name for your project.
+
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
+Save Game
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
+
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
+Option
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
+
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
+Statistik
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
+
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
+Shop
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
+
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
+## Pembagian Kerja
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
+1. Fahrian Afdholi (13521031)
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
+- Environment
+- Game Over
+- Weapon
+- Mob
+- Multitype Input
-## License
-For open source projects, say how it is licensed.
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+2. Ezra M C M H (13521073)
+
+- Story
+- Main Menu
+- Save Game
+- Statistik Game
+- Game Over
+
+3. Noel Christoffel Simbolon (13521096)
+
+- Orb
+- CutScene
+
+4. Ammar Rasyad Chaeroel (13521136)
+
+- Mob
+- Cheat
+
+5. Zidane Firzatullah (13521163)
+
+- Story
+- Main Menu
+- Save Game
+- Statistik Game
+- CutScene
+- ShopKeeper
+- Pet
+- Player
+- Multitype Input
+
+6. M Surya Dharma Khazinatul Azro (10023509)
+
+- Diskusi
+
+## Jam Persiapan dan Pengerjaan
+
+1. Fahrian Afdholi (13521031) : 60 Jam
+
+2. Ezra M C M H (13521073) : 30 Jam
+
+3. Noel Christoffel Simbolon (13521096) : 30 Jam
+
+4. Ammar Rasyad Chaeroel (13521136) : 30 Jam
+
+5. Zidane Firzatullah (13521163) : 60 Jam
+
+6. M Surya Dharma Khazinatul Azro (10023509) : 3 Jam
\ No newline at end of file
diff --git a/Screenshot/Level_1.png b/Screenshot/Level_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b414180e503bb4cc29afdd0c3bcee515e1a33ae
Binary files /dev/null and b/Screenshot/Level_1.png differ
diff --git a/Screenshot/Level_2.png b/Screenshot/Level_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1bac33ce500ca3b9b9ecfda79de06dc120b4a30
Binary files /dev/null and b/Screenshot/Level_2.png differ
diff --git a/Screenshot/Level_3.png b/Screenshot/Level_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff55a5b390580b72b8aabd3fe906218b28685ad
Binary files /dev/null and b/Screenshot/Level_3.png differ
diff --git a/Screenshot/Level_4.png b/Screenshot/Level_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..1047be9c394474ea03c9244e8b647e1b3ef8e5fc
Binary files /dev/null and b/Screenshot/Level_4.png differ
diff --git a/Screenshot/MainMenu.png b/Screenshot/MainMenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bf64f8e74bf3869838836401ed16957f6957b43
Binary files /dev/null and b/Screenshot/MainMenu.png differ
diff --git a/Screenshot/Option.png b/Screenshot/Option.png
new file mode 100644
index 0000000000000000000000000000000000000000..90db581c8d07d7cb4a9a70800f2c21dcaed2c7d6
Binary files /dev/null and b/Screenshot/Option.png differ
diff --git a/Screenshot/SaveGame.png b/Screenshot/SaveGame.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d269ccd4cbe76d107cbec2dbe8866d3e176b7d4
Binary files /dev/null and b/Screenshot/SaveGame.png differ
diff --git a/Screenshot/Shopkeeper.png b/Screenshot/Shopkeeper.png
new file mode 100644
index 0000000000000000000000000000000000000000..7025a0181564b2143846299d553bd1edddd0cd78
Binary files /dev/null and b/Screenshot/Shopkeeper.png differ
diff --git a/Screenshot/Statistik.png b/Screenshot/Statistik.png
new file mode 100644
index 0000000000000000000000000000000000000000..e332b0a501da67cf74351ed6bd868bfed54a08ad
Binary files /dev/null and b/Screenshot/Statistik.png differ