From 3a1525119fa69e86071586c4e805c0724f3802fd Mon Sep 17 00:00:00 2001
From: reynull <13519045@std.stei.itb.ac.id>
Date: Wed, 12 Apr 2023 18:22:27 +0700
Subject: [PATCH] add description to weapon and pet
---
Assets/Prefabs/Shop.prefab | 98 +--------------------------
Assets/Scripts/Shop/Pet.json | 12 ++--
Assets/Scripts/Shop/ShopController.cs | 1 +
Assets/Scripts/Shop/Weapon.json | 22 +++---
4 files changed, 21 insertions(+), 112 deletions(-)
diff --git a/Assets/Prefabs/Shop.prefab b/Assets/Prefabs/Shop.prefab
index 785a7f46..054d9758 100644
--- a/Assets/Prefabs/Shop.prefab
+++ b/Assets/Prefabs/Shop.prefab
@@ -64,7 +64,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 4379400042357802465}
- {fileID: 2269369891593719786}
- {fileID: 3786599950275999377}
m_Father: {fileID: 8220585609747672207}
@@ -82,7 +81,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1633bb12434d68b46ab558d1b9043e51, type: 3}
m_Name:
m_EditorClassIdentifier:
- pauseCameraObject: {fileID: 4379400042357802467}
+ pauseCameraObject: {fileID: 0}
ShopUI: {fileID: 5425745262142268639}
eventSystem: {fileID: 0}
--- !u!114 &5389956746024638138
@@ -141,7 +140,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5389956746024638148}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &8065976514530513541
Light:
@@ -508,7 +507,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5389956746024638148}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5736491235823694060
MeshFilter:
@@ -591,94 +590,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!1001 &8547011026858807127
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 5389956746024638148}
- m_Modifications:
- - target: {fileID: 5358109398903638708, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_Name
- value: Camera Pause
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638708, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalPosition.x
- value: 2.69
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.8334885
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalPosition.z
- value: -2.543152
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.99939084
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.034899496
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 37.84
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 6.498
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -1.753
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_Follow
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_LookAt
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_Priority
- value: -2
- objectReference: {fileID: 0}
- - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: m_StandbyUpdate
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6257698864391349085, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- propertyPath: XYAxis
- value:
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
---- !u!4 &4379400042357802465 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- m_PrefabInstance: {fileID: 8547011026858807127}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &4379400042357802467 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 5358109398903638708, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
- m_PrefabInstance: {fileID: 8547011026858807127}
- m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Scripts/Shop/Pet.json b/Assets/Scripts/Shop/Pet.json
index fb06d850..0ce7755c 100644
--- a/Assets/Scripts/Shop/Pet.json
+++ b/Assets/Scripts/Shop/Pet.json
@@ -2,22 +2,22 @@
"item1": {
"name": "Kiana",
"type": "Attacker",
- "desc": "",
- "price": 0,
+ "desc": "Menyerang musuh dan mengejar musuh. Dapat terkena damage oleh musuh apabila terlalu dekat. Tipe serangan yang dilakukan adalah jarak jauh.",
+ "price": 1000,
"prefab": ""
},
"item2": {
"name": "Yun",
"type": "Healer",
- "desc": "",
- "price": 0,
+ "desc": "Memberikan <color=green>heal</color> setiap <color=red>10</color> detik kepada pemain. Pet akan berusaha menghindari musuh",
+ "price": 1500,
"prefab": ""
},
"item3": {
"name": "Tuna",
"type": "Supporter",
- "desc": "",
- "price": 0,
+ "desc": "Memberikan Pemain <color=red>Aura Buff</color> yang meningkatkan <color=red>damage</color> pemain. Pet akan berusaha menghindari musuh",
+ "price": 1250,
"prefab": ""
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Shop/ShopController.cs b/Assets/Scripts/Shop/ShopController.cs
index 232ecb5a..a14e7008 100644
--- a/Assets/Scripts/Shop/ShopController.cs
+++ b/Assets/Scripts/Shop/ShopController.cs
@@ -28,6 +28,7 @@ public class ShopController : MonoBehaviour
Cursor.lockState = CursorLockMode.None;
pauseCamera.Priority = 12;
ShopUI.SetActive(true);
+ // Set EventSystem so the UI Document can load normally
eventSystem.SetActive(false);
}
diff --git a/Assets/Scripts/Shop/Weapon.json b/Assets/Scripts/Shop/Weapon.json
index 3e00db21..efc8fb55 100644
--- a/Assets/Scripts/Shop/Weapon.json
+++ b/Assets/Scripts/Shop/Weapon.json
@@ -1,23 +1,23 @@
{
"item1": {
"name": "Shotgun",
- "type": "Spread",
- "desc": "Menembakkan peluru dalam jumlah banyak dengan area yang lebih besar",
+ "type": "Tersebar",
+ "desc": "Menembakkan peluru dalam jumlah banyak pada area lebih luas. Musuh yang dekat akan menerima <color=red>damage</color> yang lebih besar",
"price": 350,
- "prefab": "the prefab of the shotgun (temp)"
+ "prefab": "Shotgun"
},
"item2": {
- "name": "Sword",
- "type": "",
- "desc": "",
- "price": 0,
- "prefab": ""
+ "name": "Golok",
+ "type": "Jarak Dekat",
+ "desc": "Menyerang musuh pada jarak dekat.",
+ "price": 500,
+ "prefab": "Golok"
},
"item3": {
"name": "Bow",
- "type": "",
- "desc": "",
- "price": 0,
+ "type": "Proyektil",
+ "desc": "Menggunakan anak panah untuk menembak. Memberikan <color=red>damage</color> yang lebih besar dengan charge penuh",
+ "price": 400,
"prefab": ""
}
}
\ No newline at end of file
--
GitLab