diff --git a/Assets/SFX/skeleton.wav.meta b/Assets/SFX/skeleton.wav.meta
index 6f297f3b01591fb1248a97031370f2b5dd0e34a3..3f4591ba510ee597bac820dcb1cebccf04712774 100644
--- a/Assets/SFX/skeleton.wav.meta
+++ b/Assets/SFX/skeleton.wav.meta
@@ -1,21 +1,22 @@
fileFormatVersion: 2
guid: cb387d58af1a39047815ce1bd8a6cf0c
-timeCreated: 1541766395
-licenseType: Store
AudioImporter:
- serializedVersion: 6
+ externalObjects: {}
+ serializedVersion: 7
defaultSettings:
+ serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
+ preloadAudioData: 1
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
- preloadAudioData: 1
loadInBackground: 0
+ ambisonic: 0
3D: 1
userData:
assetBundleName:
diff --git a/Assets/Scenes/Level04.unity b/Assets/Scenes/Level04.unity
index a4fcfd98158bd80f0be6c881b8e6dc8cad97e72e..029be54ceb5df4001e817c5c668cc51c9d7e12dd 100644
--- a/Assets/Scenes/Level04.unity
+++ b/Assets/Scenes/Level04.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3488,6 +3488,63 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7f6a43b7f28b6c42890ce7153345c07, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &880025823
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 7838514508986632005, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_Name
+ value: PetManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: c3262de077febf24a84367fec8297e36, type: 3}
--- !u!1 &916377278 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1401507406560278165, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3}
@@ -5206,6 +5263,79 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88e9169a6e1a34d43a3188cf129af93a, type: 3}
+--- !u!1001 &1570111516
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 266344222175847303, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_Name
+ value: GameStateManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsBought.Array.data[0]
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsBought.Array.data[1]
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsHealth.Array.data[0]
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsHealth.Array.data[1]
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 75.24971
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 118.28952
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 82.36913
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
--- !u!4 &1604597926 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4250805365076402, guid: 8da19fac2d7b4534895cdd95853c048f, type: 3}
@@ -7335,4 +7465,6 @@ SceneRoots:
- {fileID: 300943126}
- {fileID: 128565884}
- {fileID: 859731727}
- - {fileID: 1098502078}
+ - {fileID: 379622453}
+ - {fileID: 633448953}
+ - {fileID: 880025823}
diff --git a/Assets/Scenes/ShopCutscene.unity b/Assets/Scenes/ShopCutscene.unity
index 92cd86d7b96270d8c29f8e9f641b9879834a9d80..12a6f8caf94b5cafb803a9c020e047ecb6cbcd9d 100644
--- a/Assets/Scenes/ShopCutscene.unity
+++ b/Assets/Scenes/ShopCutscene.unity
@@ -1535,7 +1535,6 @@ GameObject:
- component: {fileID: 720384039}
- component: {fileID: 720384038}
- component: {fileID: 720384040}
- - component: {fileID: 720384041}
m_Layer: 5
m_Name: ShopBox
m_TagString: Untagged
@@ -1627,44 +1626,6 @@ MonoBehaviour:
newImage1: {fileID: 21300000, guid: 8306a111b47cdba4f8a61af3f4c03a5f, type: 3}
newImage2: {fileID: 21300000, guid: 44b2436fa1fb59c4fae7c65f32b9e435, type: 3}
transactionSound: {fileID: 8300000, guid: 086f56e0aeb2c994ebc81ad124580341, type: 3}
---- !u!114 &720384041
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 720384036}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 17eaa32a09a6b20469cc5d930de7c1d7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- coin: 50
- playerHealth: 0
- playerPosition: {x: 0, y: 0, z: 0}
- levelName:
- hasDamageOrb: 0
- countDamageOrb: 0
- hasSpeedOrb: 0
- speedOrbTime: 0
- lifetime: 0
- distance: 0
- onHitTarget: 0
- rajaKill: 0
- jendralKill: 0
- kepalaKrocoKill: 0
- krocoKill: 0
- loadSpeed: 0
- loadHealth: 0
- petsBought: 0000
- petsHealth:
- - -1
- - -1
- bulletShot: 0
- playerName:
- difficulty:
- gameVolume: 0
- timeLimit: 60
--- !u!1 &775521594
GameObject:
m_ObjectHideFlags: 0
@@ -2147,6 +2108,67 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1028946997
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 266344222175847303, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_Name
+ value: GameStateManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: coin
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 75.2497
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 118.28951
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 82.369125
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
--- !u!1 &1029841696
GameObject:
m_ObjectHideFlags: 0
@@ -2995,3 +3017,4 @@ SceneRoots:
- {fileID: 30173067}
- {fileID: 959187528}
- {fileID: 1009119990}
+ - {fileID: 1028946997}
diff --git a/Assets/Scripts/Global/GameStateManager.cs b/Assets/Scripts/Global/GameStateManager.cs
index 8cabd1c80b0ba4e594ad5d739979680acecc7a52..d68c561f9aaa5e17bcb11276d32dc439fb5f4987 100644
--- a/Assets/Scripts/Global/GameStateManager.cs
+++ b/Assets/Scripts/Global/GameStateManager.cs
@@ -3,7 +3,7 @@ using UnityEngine;
public class GameStateManager : MonoBehaviour
{
public static GameStateManager Instance;
- [HideInInspector]
+ // [HideInInspector]
public int coin;
[HideInInspector]
public float playerHealth;
@@ -39,7 +39,7 @@ public class GameStateManager : MonoBehaviour
// karena player bisa punya 2 pet saja
public bool[] petsBought = new []{false, false};
// -1 artinya blm kebeli, 0 artinya udah mati
- public float[] petsHealth = new[] { -1f, -1f };
+ public float[] petsHealth = new[] { 100f, 100f };
// BUAT STATISTIK
public int bulletShot;
@@ -203,6 +203,6 @@ public class GameStateManager : MonoBehaviour
public void BuyPet(int i)
{
petsBought[i] = true;
- petsHealth[i] = 100f;
+ petsHealth[i] = 100;
}
}